--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java Wed Apr 25 14:53:35 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java Wed Apr 25 09:45:45 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -51,6 +51,7 @@
import com.sun.tools.javac.code.Type.JCVoidType;
import com.sun.tools.javac.code.Type.MethodType;
import com.sun.tools.javac.code.Type.UnknownType;
+import com.sun.tools.javac.code.Types.UniqueType;
import com.sun.tools.javac.comp.Modules;
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
@@ -247,6 +248,26 @@
*/
private final Map<Name, ModuleSymbol> modules = new LinkedHashMap<>();
+ private final Map<Types.UniqueType, VarSymbol> classFields = new HashMap<>();
+
+ public VarSymbol getClassField(Type type, Types types) {
+ return classFields.computeIfAbsent(
+ new UniqueType(type, types), k -> {
+ Type arg = null;
+ if (type.getTag() == ARRAY || type.getTag() == CLASS)
+ arg = types.erasure(type);
+ else if (type.isPrimitiveOrVoid())
+ arg = types.boxedClass(type).type;
+ else
+ throw new AssertionError(type);
+
+ Type t = new ClassType(
+ classType.getEnclosingType(), List.of(arg), classType.tsym);
+ return new VarSymbol(
+ STATIC | PUBLIC | FINAL, names._class, t, type.tsym);
+ });
+ }
+
public void initType(Type type, ClassSymbol c) {
type.tsym = c;
typeOfTag[type.getTag().ordinal()] = type;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Apr 25 14:53:35 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Apr 25 09:45:45 2018 -0700
@@ -3731,11 +3731,7 @@
} else if (name == names._class) {
// In this case, we have already made sure in
// visitSelect that qualifier expression is a type.
- Type t = syms.classType;
- List<Type> typeargs = List.of(types.erasure(site));
- t = new ClassType(t.getEnclosingType(), typeargs, t.tsym);
- return new VarSymbol(
- STATIC | PUBLIC | FINAL, names._class, t, site.tsym);
+ return syms.getClassField(site, types);
} else {
// We are seeing a plain identifier as selector.
Symbol sym = rs.findIdentInType(env, site, name, resultInfo.pkind);
@@ -3773,11 +3769,7 @@
if (name == names._class) {
// In this case, we have already made sure in Select that
// qualifier expression is a type.
- Type t = syms.classType;
- Type arg = types.boxedClass(site).type;
- t = new ClassType(t.getEnclosingType(), List.of(arg), t.tsym);
- return new VarSymbol(
- STATIC | PUBLIC | FINAL, names._class, t, site.tsym);
+ return syms.getClassField(site, types);
} else {
log.error(pos, Errors.CantDeref(site));
return syms.errSymbol;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/lambda/deduplication/ClassFieldDeduplication.java Wed Apr 25 09:45:45 2018 -0700
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2018, 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 8202141
+ * @summary Verify that .class synthetic Symbols are not duplicated.
+ * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.code
+ * jdk.compiler/com.sun.tools.javac.tree
+ * jdk.compiler/com.sun.tools.javac.util
+ * @build combo.ComboTestHelper
+ * @run main ClassFieldDeduplication
+ */
+
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
+import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
+import com.sun.tools.javac.tree.TreeScanner;
+import combo.ComboInstance;
+import combo.ComboParameter;
+import combo.ComboTestHelper;
+
+public class ClassFieldDeduplication extends ComboInstance<ClassFieldDeduplication> {
+
+ enum Type implements ComboParameter {
+ OBJECT("Object"),
+ PRIMITIVE("int"),
+ BOXED_PRIMITIVE("Integer"),
+ VOID("void"),
+ BOXED_VOID("Void"),
+ OBJECT_ARRAY("Object[]"),
+ PRIMITIVE_ARRAY("int[]"),
+ BOXED_PRIMITIVE_ARRAY("Integer[]"),
+ BOXED_VOID_ARRAY("Void[]");
+
+ String type;
+
+ Type(String type) {
+ this.type = type;
+ }
+
+ @Override
+ public String expand(String optParameter) {
+ return type;
+ }
+
+ }
+
+ public static void main(String... args) throws Exception {
+ new ComboTestHelper<ClassFieldDeduplication>()
+ .withDimension("TYPE", Type.values())
+ .run(ClassFieldDeduplication::new);
+ }
+
+ private static final String TEMPLATE =
+ "class Test { void t() { Object o1 = #{TYPE}.class; Object o2 = #{TYPE}.class; } }";
+
+ @Override
+ protected void doWork() throws Throwable {
+ newCompilationTask()
+ .withSourceFromTemplate(TEMPLATE)
+ .withListener(new TaskListener() {
+ JCCompilationUnit cut;
+ @Override
+ public void finished(TaskEvent e) {
+ if (e.getKind() == TaskEvent.Kind.PARSE) {
+ if (cut != null)
+ throw new AssertionError();
+ cut = (JCCompilationUnit) e.getCompilationUnit();
+ }
+ if (e.getKind() == TaskEvent.Kind.ANALYZE) {
+ cut.accept(new TreeScanner() {
+ Symbol s;
+ @Override
+ public void visitSelect(JCFieldAccess tree) {
+ if (tree.name.contentEquals("class")) {
+ if (s == null) {
+ s = tree.sym;
+ } else if (s != tree.sym) {
+ throw new AssertionError("Duplicated field symbol.");
+ }
+ }
+ super.visitSelect(tree);
+ }
+ });
+ }
+ }
+
+ })
+ .analyze(els -> {});
+ }
+
+}
--- a/test/langtools/tools/javac/lambda/deduplication/Deduplication.java Wed Apr 25 14:53:35 2018 +0200
+++ b/test/langtools/tools/javac/lambda/deduplication/Deduplication.java Wed Apr 25 09:45:45 2018 -0700
@@ -38,6 +38,31 @@
(Runnable) () -> { ( (Runnable) () -> {} ).run(); }
);
+ group(
+ (Runnable) () -> { Deduplication.class.toString(); },
+ (Runnable) () -> { Deduplication.class.toString(); }
+ );
+
+ group(
+ (Runnable) () -> { Integer[].class.toString(); },
+ (Runnable) () -> { Integer[].class.toString(); }
+ );
+
+ group(
+ (Runnable) () -> { char.class.toString(); },
+ (Runnable) () -> { char.class.toString(); }
+ );
+
+ group(
+ (Runnable) () -> { Void.class.toString(); },
+ (Runnable) () -> { Void.class.toString(); }
+ );
+
+ group(
+ (Runnable) () -> { void.class.toString(); },
+ (Runnable) () -> { void.class.toString(); }
+ );
+
group((Function<String, Integer>) x -> x.hashCode());
group((Function<Object, Integer>) x -> x.hashCode());