From 7ac2079ba7dd07c61576e0b39692a94eecc96e07 Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Mon, 6 Feb 2023 12:24:21 +0000
Subject: [PATCH] 8301025: ClassCastException in switch with generic record

Reviewed-by: jlahoda
---
 .../sun/tools/javac/comp/TransPatterns.java   |  2 +-
 test/langtools/tools/javac/T8301025.java      | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/langtools/tools/javac/T8301025.java

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 57cd9671ca9..c928c7c75d1 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
@@ -334,7 +334,7 @@ public class TransPatterns extends TreeTranslator {
             }
             JCMethodInvocation componentAccessor =
                     make.App(make.Select(convert(make.Ident(recordBinding), recordBinding.type), //TODO - cast needed????
-                             component.accessor));
+                             component.accessor)).setType(types.erasure(component.accessor.getReturnType()));
             if (deconstructorCalls == null) {
                 deconstructorCalls = Collections.newSetFromMap(new IdentityHashMap<>());
             }
diff --git a/test/langtools/tools/javac/T8301025.java b/test/langtools/tools/javac/T8301025.java
new file mode 100644
index 00000000000..e853e4c73a4
--- /dev/null
+++ b/test/langtools/tools/javac/T8301025.java
@@ -0,0 +1,45 @@
+/*
+ * 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 8301025
+ * @enablePreview
+ * @compile T8301025.java
+ * @summary ClassCastException in switch with generic record
+ * @modules jdk.compiler
+ */
+public class T8301025 {
+    record TestRecord<T extends String>(T t) {}
+
+    public static void main(String argv[]) {
+        TestRecord r = new TestRecord("a");
+        switch (r) {
+            case TestRecord(String cS)-> {
+                System.out.println("String");
+            }
+            case TestRecord(Object cO)->{
+                System.out.println("Object");
+            }
+        }
+    }
+}