Bug 508799 - Incremental compile produces invalid errorsI20170416-2000I20170415-2000

Change-Id: Ie221cb0e7040b3b6d693273821fe32103e16a05e

2 files changed, 49 insertions, 1 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java
index 8375b7bdab..beee136786 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest.java
@@ -6013,5 +6013,53 @@ public void testBug469297() {
 			"----------\n");
 	}
 }
+public void testBug508799() {
+	Map customOptions = getCompilerOptions();
+	customOptions.put(JavaCore.COMPILER_PB_RAW_TYPE_REFERENCE, JavaCore.IGNORE);
+	runConformTest(
+		new String[] {
+			"test/A.java",
+			"package test;\n" +
+			"\n" +
+			"public interface A<T extends Iterable> {\n" +
+			"    void a();\n" +
+			"}\n" +
+			"",
+			"test/B1.java",
+			"package test;\n" +
+			"\n" +
+			"public interface B1 extends A<Iterable> {\n" +
+			"    void b1();\n" +
+			"}\n" +
+			"",
+			"test/B2.java",
+			"package test;\n" +
+			"\n" +
+			"public interface B2 extends A<Iterable> {\n" +
+			"    void b2();\n" +
+			"}\n" +
+			"",
+		},
+		customOptions
+	);
+	runConformTest(false,
+		new String[] {
+			"test/C.java",
+			"package test;\n" +
+			"\n" +
+			"public class C implements B1, B2 {\n" +
+			"    public void a() {\n" +
+			"    }\n" +
+			"\n" +
+			"    public void b1() {\n" +
+			"    }\n" +
+			"\n" +
+			"    public void b2() {\n" +
+			"    }\n" +
+			"}\n" +
+			"",
+		}, null, customOptions, "", "", "", null
+	);
+}
 }
 
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeSystem.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeSystem.java
index 965f055739..e01b439ea5 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeSystem.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeSystem.java
@@ -79,7 +79,7 @@ public class TypeSystem {
 			public int hashCode() {
 				int hashCode = this.type.hashCode() + 13 * (this.enclosingType != null ? this.enclosingType.hashCode() : 0);
 				for (int i = 0, length = this.arguments == null ? 0 : this.arguments.length; i < length; i++) {
-					hashCode += (i + 1) * this.arguments[i].id * this.arguments[i].hashCode();
+					hashCode += (i + 1) * this.arguments[i].hashCode();
 				}
 				return hashCode;
 			}