Print this page
rev 1021 : 6858164: invokedynamic code needs some cleanup (post-6655638)
Note: The bug ID for this change set was erroneously used to call for review of 6815692.
Summary: Fix several crashers, remove needless paths for boxed-style bootstrap method call, refactor & simplify APIs for rewriter constantPoolOop, remove sun.dyn.CallSiteImpl
Reviewed-by: ?
rev 1024 : imported patch indy-cleanup-6893081.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/classfile/systemDictionary.hpp
          +++ new/src/share/vm/classfile/systemDictionary.hpp
↓ open down ↓ 136 lines elided ↑ open up ↑
 137  137    template(MemberName_klass,             sun_dyn_MemberName,             Opt) \
 138  138    template(MethodHandleImpl_klass,       sun_dyn_MethodHandleImpl,       Opt) \
 139  139    template(AdapterMethodHandle_klass,    sun_dyn_AdapterMethodHandle,    Opt) \
 140  140    template(BoundMethodHandle_klass,      sun_dyn_BoundMethodHandle,      Opt) \
 141  141    template(DirectMethodHandle_klass,     sun_dyn_DirectMethodHandle,     Opt) \
 142  142    template(MethodType_klass,             java_dyn_MethodType,            Opt) \
 143  143    template(MethodTypeForm_klass,         java_dyn_MethodTypeForm,        Opt) \
 144  144    template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \
 145  145    template(Linkage_klass,                java_dyn_Linkage,               Opt) \
 146  146    template(CallSite_klass,               java_dyn_CallSite,              Opt) \
 147      -  template(Dynamic_klass,                java_dyn_Dynamic,               Opt) \
      147 +  template(InvokeDynamic_klass,          java_dyn_InvokeDynamic,         Opt) \
 148  148    /* Note: MethodHandle must be first, and Dynamic last in group */           \
 149  149                                                                                \
 150  150    template(vector_klass,                 java_util_Vector,               Pre) \
 151  151    template(hashtable_klass,              java_util_Hashtable,            Pre) \
 152  152    template(stringBuffer_klass,           java_lang_StringBuffer,         Pre) \
 153  153                                                                                \
 154  154    /* It's NULL in non-1.4 JDKs. */                                            \
 155  155    template(stackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
 156  156    /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
 157  157    /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
↓ open down ↓ 505 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX