8317048: VerifyError with unnamed pattern variable and more than one …

…components
biboudis · Sep 29, 2023 · 5ee4d17 · 5ee4d17
1 parent b8b8bd6
commit 5ee4d17
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -907,6 +907,7 @@ public void resolve(VarSymbol commonBinding,
                 }
             } else if (currentBinding != null &&
                        commonBinding.type.tsym == currentBinding.type.tsym &&
+                       commonBinding.isUnnamedVariable() == currentBinding.isUnnamedVariable() &&
                        !previousNullable &&
                        new TreeDiffer(List.of(commonBinding), List.of(currentBinding))
                                .scan(commonNestedExpression, currentNestedExpression)) {

diff --git a/test/langtools/tools/javac/patterns/T8317048.java b/test/langtools/tools/javac/patterns/T8317048.java
@@ -35,7 +35,7 @@ record R1<T>(Integer value) implements R<T> {}
     record R2<T>(Integer value) implements R<T> {}
     sealed interface R<T> {}
 
-    static <T1 extends Comparable, T2 extends Comparable> int compareTo(Tuple<R<T1>, R<T2>> o) {
+    static <T1 extends Comparable, T2 extends Comparable> int meth1(Tuple<R<T1>, R<T2>> o) {
         return switch (o) {
             case Tuple<R<T1>, R<T2>>(R1<T1> _, R1<T2> _) -> -1;
             case Tuple<R<T1>, R<T2>>(R1<T1> _, R2<T2> _) -> -1;
@@ -44,7 +44,45 @@ static <T1 extends Comparable, T2 extends Comparable> int compareTo(Tuple<R<T1>,
         };
     }
 
+    static <T1 extends Comparable, T2 extends Comparable> int meth2(Tuple<R<T1>, R<T2>> o) {
+        return switch (o) {
+            case Tuple<R<T1>, R<T2>>(R1<T1> _, R1<T2> _) -> -1;
+            case Tuple<R<T1>, R<T2>>(R1<T1> fst, R2<T2> snd) -> fst.value().compareTo(snd.value());
+            case Tuple<R<T1>, R<T2>>(R2<T1> _, R1<T2> _) -> -1;
+            case Tuple<R<T1>, R<T2>>(R2<T1> fst, R2<T2> snd) -> fst.value().compareTo(snd.value());
+        };
+    }
+
+    static <T1 extends Comparable, T2 extends Comparable> int meth3(Tuple<R<T1>, R<T2>> o) {
+        return switch (o) {
+            case Tuple<R<T1>, R<T2>>(R1<T1> fst, R1<T2> _) -> fst.value();
+            case Tuple<R<T1>, R<T2>>(R1<T1> _, R2<T2> snd) -> snd.value();
+            case Tuple<R<T1>, R<T2>>(R2<T1> _, R1<T2> _) -> -1;
+            case Tuple<R<T1>, R<T2>>(R2<T1> fst, R2<T2> snd) -> fst.value().compareTo(snd.value());
+        };
+    }
+
+    static <T1 extends Comparable, T2 extends Comparable> int meth4(Tuple<R<T1>, R<T2>> o) {
+        return switch (o) {
+            case Tuple<R<T1>, R<T2>>(R1<T1> _, R1<T2> _) -> -1;
+            case Tuple<R<T1>, R<T2>>(R1<T1> _, R2<T2> _) -> -1;
+            case Tuple<R<T1>, R<T2>>(R2<T1> fst, R2<T2> snd) -> fst.value().compareTo(snd.value());
+            case Tuple<R<T1>, R<T2>>(R2<T1> _, R1<T2> _) -> -1;
+        };
+    }
+
     public static void main(String[] args) {
-        compareTo(new Tuple<R<Integer>, R<Integer>>(new R2<>(1), new R2<>(2)));
+        assertEquals(1, meth1(new Tuple<R<Integer>, R<Integer>>(new R2<>(2), new R2<>(1))));
+        assertEquals(1, meth2(new Tuple<R<Integer>, R<Integer>>(new R1<>(2), new R2<>(1))));
+        assertEquals(0, meth2(new Tuple<R<Integer>, R<Integer>>(new R2<>(1), new R2<>(1))));
+        assertEquals(2, meth3(new Tuple<R<Integer>, R<Integer>>(new R1<>(2), new R1<>(1))));
+        assertEquals(3, meth3(new Tuple<R<Integer>, R<Integer>>(new R1<>(2), new R2<>(3))));
+        assertEquals(1, meth4(new Tuple<R<Integer>, R<Integer>>(new R2<>(2), new R2<>(1))));
+    }
+
+    static void assertEquals(int expected, int actual) {
+        if (expected != actual) {
+            throw new AssertionError("Expected: " + expected + ", but got: " + actual);
+        }
     }
 }