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 1023 : [mq]: meth.walker.patch
rev 1024 : imported patch indy-cleanup-6893081.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/classfile/vmSymbols.hpp
          +++ new/src/share/vm/classfile/vmSymbols.hpp
↓ open down ↓ 209 lines elided ↑ open up ↑
 210  210                                                                                                    \
 211  211    template(annotations_name,                          "annotations")                              \
 212  212    template(parameter_annotations_name,                "parameterAnnotations")                     \
 213  213    template(annotation_default_name,                   "annotationDefault")                        \
 214  214    template(sun_reflect_ConstantPool,                  "sun/reflect/ConstantPool")                 \
 215  215    template(constantPoolOop_name,                      "constantPoolOop")                          \
 216  216    template(sun_reflect_UnsafeStaticFieldAccessorImpl, "sun/reflect/UnsafeStaticFieldAccessorImpl")\
 217  217    template(base_name,                                 "base")                                     \
 218  218                                                                                                    \
 219  219    /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */                                   \
 220      -  template(java_dyn_Dynamic,                          "java/dyn/Dynamic")                         \
      220 +  template(java_dyn_InvokeDynamic,                    "java/dyn/InvokeDynamic")                   \
 221  221    template(java_dyn_Linkage,                          "java/dyn/Linkage")                         \
 222  222    template(java_dyn_CallSite,                         "java/dyn/CallSite")                        \
 223  223    template(java_dyn_MethodHandle,                     "java/dyn/MethodHandle")                    \
 224  224    template(java_dyn_MethodType,                       "java/dyn/MethodType")                      \
 225  225    template(java_dyn_WrongMethodTypeException,         "java/dyn/WrongMethodTypeException")        \
 226  226    template(java_dyn_MethodType_signature,             "Ljava/dyn/MethodType;")                    \
 227  227    template(java_dyn_MethodHandle_signature,           "Ljava/dyn/MethodHandle;")                  \
 228  228    /* internal classes known only to the JVM: */                                                   \
 229  229    template(java_dyn_MethodTypeForm,                   "java/dyn/MethodTypeForm")                  \
 230  230    template(java_dyn_MethodTypeForm_signature,         "Ljava/dyn/MethodTypeForm;")                \
↓ open down ↓ 801 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX