changeset 3516:801acf5df528

Adjust names used in ConstantDynamic translation
author briangoetz
date Fri, 26 Aug 2016 17:42:46 -0400
parents 7c372b827541
children 93beb80dcc65
files src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
diffstat 4 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java	Fri Aug 26 17:56:53 2016 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java	Fri Aug 26 17:42:46 2016 -0400
@@ -343,7 +343,7 @@
                     } catch (CompletionFailure e) {
                         sym.flags_field |= (PUBLIC | INTERFACE);
                         ((ClassType) sym.type).supertype_field = objectType;
-                        sym.members().enter(new MethodSymbol(STATIC | PUBLIC, names.makeConstant, new MethodType(List.of(methodHandleLookupType, stringType, methodTypeType).appendList(staticArgs), restype, List.nil(), methodClass), sym));
+                        sym.members().enter(new MethodSymbol(STATIC | PUBLIC, names.primitiveClass, new MethodType(List.of(methodHandleLookupType, stringType, methodTypeType).appendList(staticArgs), restype, List.nil(), methodClass), sym));
                     }
                 }
             };
@@ -559,7 +559,7 @@
         genericStaticDispatch = enterClass("java.lang.invoke.GenericStaticDispatch");
         virtualAccess = enterClass("java.lang.invoke.VirtualAccess");
         objectibleDispatch = enterClass("java.lang.invoke.ObjectibleDispatch");
-        classConstantFactory = enterClass("java.lang.invoke.ClassConstantFactory");
+        classConstantFactory = enterClass("java.lang.invoke.ConstantDynamic");
         //transitional
         synthesizeEmptyInterfaceIfMissing(varHandleType);
         synthesizeEmptyInterfaceIfMissing(fieldHandleType);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java	Fri Aug 26 17:56:53 2016 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java	Fri Aug 26 17:42:46 2016 -0400
@@ -25,9 +25,6 @@
 
 package com.sun.tools.javac.jvm;
 
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 import com.sun.tools.javac.code.Dynamic.DynamicConstant;
@@ -2453,7 +2450,7 @@
             return rs.resolveInternalMethod(context.enclClass,
                     context,
                     syms.classConstantFactory,
-                    names.makeConstant,
+                    names.primitiveClass,
                     List.of(syms.methodHandleLookupType,
                             syms.stringType,
                             syms.methodTypeType,
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java	Fri Aug 26 17:56:53 2016 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java	Fri Aug 26 17:42:46 2016 -0400
@@ -115,7 +115,7 @@
             log.printRawLines(WriterKind.NOTICE,
                               String.format(LINT_KEY_FORMAT,
                                             "none",
-                                            log.localize(PrefixKind.JAVAC, "opt.Xlint.none")));
+                                           log.localize(PrefixKind.JAVAC, "opt.Xlint.none")));
         }
     },
 
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java	Fri Aug 26 17:56:53 2016 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java	Fri Aug 26 17:42:46 2016 -0400
@@ -194,7 +194,7 @@
     // string concat
     public final Name makeConcat;
     public final Name makeConcatWithConstants;
-    public final Name makeConstant;
+    public final Name primitiveClass;
 
     public final Name.Table table;
 
@@ -349,7 +349,7 @@
         // string concat
         makeConcat = fromString("makeConcat");
         makeConcatWithConstants = fromString("makeConcatWithConstants");
-        makeConstant = fromString("makeConstant");
+        primitiveClass = fromString("primitiveClass");
     }
 
     protected Name.Table createTable(Options options) {