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 index 59568aef60570..aedafa20c3eed 100644 --- 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 new file mode 100644 index 0000000000000..988f51ad2f0fa --- /dev/null +++ b/test/langtools/tools/javac/patterns/T8317048.java @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +/** + * @test + * @bug 8317048 + * @summary VerifyError with unnamed pattern variable and more than one components + * @enablePreview + * @compile T8317048.java + * @run main T8317048 + */ + +public class T8317048 { + record Tuple(T1 first, T2 second) {} + record R1(Integer value) implements R {} + record R2(Integer value) implements R {} + sealed interface R {} + + static int meth1(Tuple, R> o) { + return switch (o) { + case Tuple, R>(R1 _, R1 _) -> -1; + case Tuple, R>(R1 _, R2 _) -> -1; + case Tuple, R>(R2 _, R1 _) -> -1; + case Tuple, R>(R2 fst, R2 snd) -> fst.value().compareTo(snd.value()); + }; + } + + static int meth2(Tuple, R> o) { + return switch (o) { + case Tuple, R>(R1 _, R1 _) -> -1; + case Tuple, R>(R1 fst, R2 snd) -> fst.value().compareTo(snd.value()); + case Tuple, R>(R2 _, R1 _) -> -1; + case Tuple, R>(R2 fst, R2 snd) -> fst.value().compareTo(snd.value()); + }; + } + + static int meth3(Tuple, R> o) { + return switch (o) { + case Tuple, R>(R1 fst, R1 _) -> fst.value(); + case Tuple, R>(R1 _, R2 snd) -> snd.value(); + case Tuple, R>(R2 _, R1 _) -> -1; + case Tuple, R>(R2 fst, R2 snd) -> fst.value().compareTo(snd.value()); + }; + } + + static int meth4(Tuple, R> o) { + return switch (o) { + case Tuple, R>(R1 _, R1 _) -> -1; + case Tuple, R>(R1 _, R2 _) -> -1; + case Tuple, R>(R2 fst, R2 snd) -> fst.value().compareTo(snd.value()); + case Tuple, R>(R2 _, R1 _) -> -1; + }; + } + + public static void main(String[] args) { + assertEquals(1, meth1(new Tuple, R>(new R2<>(2), new R2<>(1)))); + assertEquals(1, meth2(new Tuple, R>(new R1<>(2), new R2<>(1)))); + assertEquals(0, meth2(new Tuple, R>(new R2<>(1), new R2<>(1)))); + assertEquals(2, meth3(new Tuple, R>(new R1<>(2), new R1<>(1)))); + assertEquals(3, meth3(new Tuple, R>(new R1<>(2), new R2<>(3)))); + assertEquals(1, meth4(new Tuple, R>(new R2<>(2), new R2<>(1)))); + } + + static void assertEquals(int expected, int actual) { + if (expected != actual) { + throw new AssertionError("Expected: " + expected + ", but got: " + actual); + } + } +} \ No newline at end of file