From adfc1d6cd29181c729030d4cbafc8ecf349abab9 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 4 Sep 2023 07:17:28 +0000
Subject: [PATCH] 8313323: javac -g on a java file which uses unnamed variable
leads to ClassFormatError when launching that class
Reviewed-by: vromero
---
.../classes/com/sun/tools/javac/jvm/Code.java | 2 +
.../unnamed/UnnamedLocalVariableTable.java | 49 +++++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 test/langtools/tools/javac/unnamed/UnnamedLocalVariableTable.java
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
index 9d9dff2d703..382c47935d3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
@@ -2189,6 +2189,8 @@ public class Code {
((var.sym.owner.flags() & Flags.LAMBDA_METHOD) == 0 ||
(var.sym.flags() & Flags.PARAMETER) == 0);
if (ignoredSyntheticVar) return;
+ //don't include unnamed variables:
+ if (var.sym.name == var.sym.name.table.names.empty) return ;
if (varBuffer == null)
varBuffer = new LocalVar[20];
else
diff --git a/test/langtools/tools/javac/unnamed/UnnamedLocalVariableTable.java b/test/langtools/tools/javac/unnamed/UnnamedLocalVariableTable.java
new file mode 100644
index 00000000000..6cfeefa140e
--- /dev/null
+++ b/test/langtools/tools/javac/unnamed/UnnamedLocalVariableTable.java
@@ -0,0 +1,49 @@
+/*
+ * 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 8313323
+ * @summary Verify javac does not produce incorrect LocalVariableTable
+ * @enablePreview
+ * @compile -g UnnamedLocalVariableTable.java
+ * @run main UnnamedLocalVariableTable
+ */
+public class UnnamedLocalVariableTable {
+ public static void main(String... args) {
+ try {
+ int _ = 0;
+ if (args[0] instanceof String _) {
+ System.err.println("1");
+ }
+ I i = _ -> {};
+ java.util.List<String> _ = null;
+ } catch (Exception _) {
+ System.err.println("2");
+ }
+ }
+
+ interface I {
+ public void test(String s);
+ }
+}