changeset 53972:4bd0c15e9a63 lworld

8217966: [lworld] ClassFormatError: Illegal class name "QX$Entry<TE;>;" in class file X$Entry
author sadayapalam
date Tue, 29 Jan 2019 16:00:40 +0530
parents e8e2b6a83723
children 1049b319f14c
files src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java test/langtools/tools/javac/valhalla/lworld-values/GenericArrayRegression.java
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java	Tue Jan 29 13:44:36 2019 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java	Tue Jan 29 16:00:40 2019 +0530
@@ -258,9 +258,9 @@
     int makeRef(DiagnosticPosition pos, Type type, boolean emitQtype) {
         checkDimension(pos, type);
         if (type.isAnnotated()) {
-            return pool.put(emitQtype ? new UniqueType(type, types) : type);
+            return pool.put(emitQtype ? new UniqueType(type, types, false) : type);
         } else {
-            return pool.put(type.hasTag(CLASS) ? emitQtype ? new UniqueType(type, types) : type.tsym : (Object)type);
+            return pool.put(type.hasTag(CLASS) ? emitQtype ? new UniqueType(type, types, false) : type.tsym : (Object)type);
         }
     }
 
--- a/test/langtools/tools/javac/valhalla/lworld-values/GenericArrayRegression.java	Tue Jan 29 13:44:36 2019 +0530
+++ b/test/langtools/tools/javac/valhalla/lworld-values/GenericArrayRegression.java	Tue Jan 29 16:00:40 2019 +0530
@@ -23,9 +23,10 @@
 
 /**
  * @test
- * @bug 8217958
+ * @bug 8217958 8217966
  * @summary Trouble assigning/casting to a value array type with parameterized element type
  * @compile GenericArrayRegression.java
+ * @run main/othervm -XX:+EnableValhalla GenericArrayRegression
  */
 
 public class GenericArrayRegression {