src/share/vm/classfile/vmSymbols.hpp

rev 1080 : [mq]: meth.walker.patch
rev 1081 : imported patch indy-cleanup-6893081.patch

*** 216,226 ****
    template(constantPoolOop_name,                      "constantPoolOop")                          \
    template(sun_reflect_UnsafeStaticFieldAccessorImpl, "sun/reflect/UnsafeStaticFieldAccessorImpl")\
    template(base_name,                                 "base")                                     \
                                                                                                    \
    /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */                                   \
!   template(java_dyn_Dynamic,                          "java/dyn/Dynamic")                         \
    template(java_dyn_Linkage,                          "java/dyn/Linkage")                         \
    template(java_dyn_CallSite,                         "java/dyn/CallSite")                        \
    template(java_dyn_MethodHandle,                     "java/dyn/MethodHandle")                    \
    template(java_dyn_MethodType,                       "java/dyn/MethodType")                      \
    template(java_dyn_WrongMethodTypeException,         "java/dyn/WrongMethodTypeException")        \
--- 216,226 ----
    template(constantPoolOop_name,                      "constantPoolOop")                          \
    template(sun_reflect_UnsafeStaticFieldAccessorImpl, "sun/reflect/UnsafeStaticFieldAccessorImpl")\
    template(base_name,                                 "base")                                     \
                                                                                                    \
    /* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */                                   \
!   template(java_dyn_InvokeDynamic,                    "java/dyn/InvokeDynamic")                   \
    template(java_dyn_Linkage,                          "java/dyn/Linkage")                         \
    template(java_dyn_CallSite,                         "java/dyn/CallSite")                        \
    template(java_dyn_MethodHandle,                     "java/dyn/MethodHandle")                    \
    template(java_dyn_MethodType,                       "java/dyn/MethodType")                      \
    template(java_dyn_WrongMethodTypeException,         "java/dyn/WrongMethodTypeException")        \