From 54957ac55f8c6c68efc80436417ff30d4e9e2d37 Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Fri, 1 Dec 2023 14:15:38 +0000
Subject: [PATCH] 8312560: Annotation on Decomposed Record Component in
 Enhanced For Loop Fails Compilation

Reviewed-by: jlahoda
---
 .../com/sun/tools/javac/comp/Attr.java        |  6 +--
 .../tools/javac/patterns/T8312560.java        | 43 +++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/T8312560.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 567cf0a191f..342ccb26798 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4186,11 +4186,11 @@ public class Attr extends JCTree.Visitor {
         if (chk.checkUnique(tree.var.pos(), v, env.info.scope)) {
             chk.checkTransparentVar(tree.var.pos(), v, env.info.scope);
         }
-        if (tree.var.vartype != null) {
-            annotate.annotateLater(tree.var.mods.annotations, env, v, tree.pos());
+        annotate.annotateLater(tree.var.mods.annotations, env, v, tree.pos());
+        if (!tree.var.isImplicitlyTyped()) {
             annotate.queueScanTreeAndTypeAnnotate(tree.var.vartype, env, v, tree.var.pos());
-            annotate.flush();
         }
+        annotate.flush();
         chk.validate(tree.var.vartype, env, true);
         result = tree.type;
         if (v.isUnnamedVariable()) {
diff --git a/test/langtools/tools/javac/patterns/T8312560.java b/test/langtools/tools/javac/patterns/T8312560.java
new file mode 100644
index 00000000000..fda3d798132
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8312560.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+/*
+ * @test
+ * @bug 8312560
+ * @summary Annotation on Decomposed Record Component in Enhanced For Loop Fails Compilation
+ * @compile T8312560.java
+ */
+public class T8312560 {
+    void m(Object o) {
+        if (o instanceof R(@A var x)) {}
+    }
+
+    @interface A {
+    }
+
+    record R(Integer x) {
+    }
+}