changeset 47432:369c89627554 condy-folding

Automatic merge with condy
author mcimadamore
date Tue, 17 Oct 2017 01:29:15 +0200
parents b846aa5f933d 55b3323cb99e
children ef9146cce88c
files test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/AbstractBuilder.java test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BasicTypeHelper.java test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BytePoolHelper.java test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/PoolTag.java
diffstat 7 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/classfile/systemDictionary.hpp	Mon Oct 16 14:42:31 2017 +0100
+++ b/src/hotspot/share/classfile/systemDictionary.hpp	Tue Oct 17 01:29:15 2017 +0200
@@ -541,7 +541,7 @@
     return find_java_mirror_for_type(signature, accessing_klass, Handle(), Handle(),
                                      failure_mode, THREAD);
   }
-                                             
+
 
   // fast short-cut for the one-character case:
   static oop       find_java_mirror_for_type(char signature_char);
--- a/src/hotspot/share/oops/constantPool.cpp	Mon Oct 16 14:42:31 2017 +0100
+++ b/src/hotspot/share/oops/constantPool.cpp	Tue Oct 17 01:29:15 2017 +0200
@@ -900,7 +900,7 @@
       assert(bsm_info != NULL, "");
       // FIXME: Cache this once per BootstrapMethods entry, not once per CONSTANT_Dynamic.
       bootstrap_specifier = Handle(THREAD, bsm_info);
-    
+
       // Resolve the Dynamically-Computed constant to invoke the BSM in order to obtain the resulting oop.
       Handle value = SystemDictionary::link_dynamic_constant(current_klass,
                                                              index,
--- a/src/hotspot/share/prims/methodHandles.cpp	Mon Oct 16 14:42:31 2017 +0100
+++ b/src/hotspot/share/prims/methodHandles.cpp	Tue Oct 17 01:29:15 2017 +0200
@@ -1348,7 +1348,6 @@
             Handle th;
             if (type->byte_at(0) == '(') {
               th = SystemDictionary::find_method_handle_type(type, caller, CHECK);
-              
             } else {
               th = SystemDictionary::find_java_mirror_for_type(type, caller, SignatureStream::NCDFError, CHECK);
             }
--- a/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/AbstractBuilder.java	Mon Oct 16 14:42:31 2017 +0100
+++ b/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/AbstractBuilder.java	Tue Oct 17 01:29:15 2017 +0200
@@ -36,7 +36,7 @@
      * The helper to build the constant pool.
      */
     protected final PoolHelper<S, T, E> poolHelper;
-    
+
     /**
      * The helper to use to manipulate type descriptors.
      */
--- a/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BasicTypeHelper.java	Mon Oct 16 14:42:31 2017 +0100
+++ b/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BasicTypeHelper.java	Tue Oct 17 01:29:15 2017 +0200
@@ -177,5 +177,5 @@
     public String returnType(String s) {
         return s.substring(s.indexOf(')') + 1, s.length());
     }
-    
+
 }
--- a/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BytePoolHelper.java	Mon Oct 16 14:42:31 2017 +0100
+++ b/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/BytePoolHelper.java	Tue Oct 17 01:29:15 2017 +0200
@@ -191,7 +191,7 @@
         }
 
         void setDynamicConstant(int bsmIndex, CharSequence name, String type) {
-            tag = PoolTag.CONSTANT_INVOKEDYNAMIC;
+            tag = PoolTag.CONSTANT_DYNAMIC;
             o1 = bsmIndex;
             o2 = name;
             o3 = type;
@@ -475,7 +475,7 @@
             int nameAndType_idx = putNameAndType(constName, constType);
             poolKey.at(currentIndex++);
             entries.enter(poolKey);
-            pool.writeByte(PoolTag.CONSTANT_CONSTANTDYNAMIC.tag);
+            pool.writeByte(PoolTag.CONSTANT_DYNAMIC.tag);
             pool.writeChar(bsmIndex);
             pool.writeChar(nameAndType_idx);
         }
--- a/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/PoolTag.java	Mon Oct 16 14:42:31 2017 +0100
+++ b/test/jdk/lib/testlibrary/bytecode/jdk/experimental/bytecode/PoolTag.java	Tue Oct 17 01:29:15 2017 +0200
@@ -38,7 +38,7 @@
     CONSTANT_NAMEANDTYPE(12),
     CONSTANT_METHODHANDLE(15),
     CONSTANT_METHODTYPE(16),
-    CONSTANT_CONSTANTDYNAMIC(17),
+    CONSTANT_DYNAMIC(17),
     CONSTANT_INVOKEDYNAMIC(18);
 
     public final int tag;