Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Brychcy2019-04-23 12:35:50 -0400
committerTill Brychcy2019-04-23 13:18:08 -0400
commit3228532d89c171c6c8189dd17f07cf77e334d9d4 (patch)
treef0cb99e6626a8f536daf68fabfe22859d6a176f9
parent6ff1559691d1c91add2193065d3fa563171f3ed7 (diff)
downloadeclipse.jdt.core-3228532d89c171c6c8189dd17f07cf77e334d9d4.tar.gz
eclipse.jdt.core-3228532d89c171c6c8189dd17f07cf77e334d9d4.tar.xz
eclipse.jdt.core-3228532d89c171c6c8189dd17f07cf77e334d9d4.zip
Bug 546362 - Deploy ecj compiler from S-4.12M1-201904110625 and use itI20190423-1800
for 4.12 M3 build Change-Id: I3ba29b351c598950735296de8efc9be9d20cccb3
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java19
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java2
2 files changed, 20 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java
index 3a18871c6a..ccba29102a 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest_1_5.java
@@ -326,6 +326,25 @@ public void test14() throws Exception {
" [pc: 17, line: 5]\n";
checkDisassembledClassFile(OUTPUT_DIR + File.separator + "LineNumberBug$Inner.class", "LineNumberBug$Inner", expectedOutput);
}
+public void testBug546362() throws Exception {
+ runConformTest(new String[] {
+ "Schema.java",
+ "import java.util.HashMap;\n" +
+ "\n" +
+ "public class Schema {\n" +
+ " public Integer[] getElements(HashMap<String, Integer> map) {\n" +
+ " return map.entrySet().toArray(new Integer[0]);\n" +
+ " }\n" +
+ "}\n" +
+ ""
+ });
+ String expectedOutput =
+ " Inner classes:\n" +
+ " [inner class info: #41 java/util/Map$Entry, outer class info: #43 java/util/Map\n" +
+ " inner name: #45 Entry, accessflags: 1545 public abstract static]\n" +
+ "";
+ checkDisassembledClassFile(OUTPUT_DIR + File.separator + "Schema.class", "X", expectedOutput);
+}
public static Class testClass() {
return InnerEmulationTest_1_5.class;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java
index 7b74cabb3b..3c9378e547 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java
@@ -1204,7 +1204,7 @@ public class ParameterizedTypeBinding extends ReferenceBinding implements Substi
for (int i = 0; i < argLength; i++) {
TypeBinding resolveType = BinaryTypeBinding.resolveType(this.arguments[i], this.environment, true /* raw conversion */);
this.arguments[i] = resolveType;
- this.tagBits |= resolvedType.tagBits & (TagBits.ContainsNestedTypeReferences | TagBits.HasMissingType);
+ this.tagBits |= resolveType.tagBits & (TagBits.ContainsNestedTypeReferences | TagBits.HasMissingType);
}
/* https://bugs.eclipse.org/bugs/show_bug.cgi?id=186565, Removed generic check
and arity check since we are dealing with binary types here and the fact that

Back to the top