changeset 53737:46c50472547f jep-334

minor documentation changes plus removing dead code
author vromero
date Mon, 03 Dec 2018 13:56:43 -0500
parents d1a13ced31d9
children 74a02916a967 53beb57897f4
files src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java
diffstat 9 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Mon Dec 03 13:56:43 2018 -0500
@@ -552,7 +552,7 @@
                 if (Utils.SORT_MEMBERS_DESCR_MAJOR)
                     // descRef is transmitted as UDELTA5; sort it first?
                     x = this.descRef.compareTo(that.descRef);
-                // Primary key is classDesc.
+                // Primary key is classRef.
                 if (x == 0)
                     x = this.classRef.compareTo(that.classRef);
                 if (x == 0)
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Mon Dec 03 13:56:43 2018 -0500
@@ -2194,7 +2194,7 @@
                         }
                         buf[pc++] = (byte) origBC;
                         int coding = bc_initref.getInt();
-                        // Find the nth overloading of <init> in classDesc.
+                        // Find the nth overloading of <init> in classRef.
                         MemberEntry ref = pkg.cp.getOverloadingForIndex(CONSTANT_Methodref, classRef, "<init>", coding);
                         fixupBuf.addU2(pc, ref);
                         buf[pc+0] = buf[pc+1] = 0;
--- a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java	Mon Dec 03 13:56:43 2018 -0500
@@ -186,7 +186,7 @@
     /**
      * Returns the invocation name that would appear in the {@code NameAndType}
      * operand of the {@code invokedynamic}.
-     * \
+     *
      * @return the invocation name
      */
     public String invocationName() {
--- a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java	Mon Dec 03 13:56:43 2018 -0500
@@ -258,7 +258,6 @@
 
     @SuppressWarnings("unchecked")
     public T resolveConstantDesc(MethodHandles.Lookup lookup) throws ReflectiveOperationException {
-        // TODO replace with public supported method
         try {
             MethodHandle bsm = (MethodHandle) bootstrapMethod.resolveConstantDesc(lookup);
             if (bsm.type().parameterCount() < 2 ||
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java	Mon Dec 03 13:56:43 2018 -0500
@@ -213,8 +213,6 @@
     public final Type documentedType;
     public final Type elementTypeType;
     public final Type functionalInterfaceType;
-    public final Type constableType;
-    public final Type constantDescType;
 
     /** The symbol representing the length field of an array.
      */
@@ -569,8 +567,6 @@
         lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory");
         stringConcatFactory = enterClass("java.lang.invoke.StringConcatFactory");
         functionalInterfaceType = enterClass("java.lang.FunctionalInterface");
-        constableType = enterClass("java.lang.constant.Constable");
-        constantDescType = enterClass("java.lang.constant.ConstantDesc");
 
         synthesizeEmptyInterfaceIfMissing(autoCloseableType);
         synthesizeEmptyInterfaceIfMissing(cloneableType);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java	Mon Dec 03 13:56:43 2018 -0500
@@ -219,7 +219,7 @@
             val1    = debuggeeClass.getValue(field1);
             objRef  = (ObjectReference) val1;
 
-            log2("......getting the mirror of tested getvalue003aTestClass : ReferenceType classDesc");
+            log2("......getting the mirror of tested getvalue003aTestClass : ReferenceType classRef");
 
             classes   = vm.classesByName(testedClassName);
             classRef  = (ReferenceType) classes.get(0);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java	Mon Dec 03 13:56:43 2018 -0500
@@ -205,7 +205,7 @@
             val1    = debuggeeClass.getValue(field1);
             objRef  = (ObjectReference) val1;
 
-            log2("......getting the mirror of tested getvalues001aTestClass : ReferenceType classDesc");
+            log2("......getting the mirror of tested getvalues001aTestClass : ReferenceType classRef");
 
             classes      = vm.classesByName(testedClassName);
             testedClass  = (ReferenceType) classes.get(0);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java	Mon Dec 03 13:56:43 2018 -0500
@@ -205,7 +205,7 @@
             val1    = debuggeeClass.getValue(field1);
             objRef  = (ObjectReference) val1;
 
-            log2("......getting the mirror of tested getvalues002aTestClass : ReferenceType classDesc");
+            log2("......getting the mirror of tested getvalues002aTestClass : ReferenceType classRef");
 
             classes      = vm.classesByName(testedClassName);
             testedClass  = (ReferenceType) classes.get(0);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java	Mon Dec 03 13:08:23 2018 -0500
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java	Mon Dec 03 13:56:43 2018 -0500
@@ -209,7 +209,7 @@
             val1    = debuggeeClass.getValue(field1);
             objRef  = (ObjectReference) val1;
 
-            log2("......getting the mirror of tested getvalues003aTestClass : ReferenceType classDesc");
+            log2("......getting the mirror of tested getvalues003aTestClass : ReferenceType classRef");
 
             classes      = vm.classesByName(testedClass1Name);
             testedClass  = (ReferenceType) classes.get(0);