src/share/vm/classfile/systemDictionary.hpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File 6893081 Sdiff src/share/vm/classfile

src/share/vm/classfile/systemDictionary.hpp

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


 127   /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
 128   template(reflect_magic_klass,          sun_reflect_MagicAccessorImpl,  Opt) \
 129   template(reflect_method_accessor_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
 130   template(reflect_constructor_accessor_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
 131   template(reflect_delegating_classloader_klass, sun_reflect_DelegatingClassLoader, Opt) \
 132   template(reflect_constant_pool_klass,  sun_reflect_ConstantPool,       Opt_Only_JDK15) \
 133   template(reflect_unsafe_static_field_accessor_impl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
 134                                                                               \
 135   /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \
 136   template(MethodHandle_klass,           java_dyn_MethodHandle,          Opt) \
 137   template(MemberName_klass,             sun_dyn_MemberName,             Opt) \
 138   template(MethodHandleImpl_klass,       sun_dyn_MethodHandleImpl,       Opt) \
 139   template(AdapterMethodHandle_klass,    sun_dyn_AdapterMethodHandle,    Opt) \
 140   template(BoundMethodHandle_klass,      sun_dyn_BoundMethodHandle,      Opt) \
 141   template(DirectMethodHandle_klass,     sun_dyn_DirectMethodHandle,     Opt) \
 142   template(MethodType_klass,             java_dyn_MethodType,            Opt) \
 143   template(MethodTypeForm_klass,         java_dyn_MethodTypeForm,        Opt) \
 144   template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \
 145   template(Linkage_klass,                java_dyn_Linkage,               Opt) \
 146   template(CallSite_klass,               java_dyn_CallSite,              Opt) \
 147   template(Dynamic_klass,                java_dyn_Dynamic,               Opt) \
 148   /* Note: MethodHandle must be first, and Dynamic last in group */           \
 149                                                                               \
 150   template(vector_klass,                 java_util_Vector,               Pre) \
 151   template(hashtable_klass,              java_util_Hashtable,            Pre) \
 152   template(stringBuffer_klass,           java_lang_StringBuffer,         Pre) \
 153                                                                               \
 154   /* It's NULL in non-1.4 JDKs. */                                            \
 155   template(stackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
 156   /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
 157   /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
 158   template(java_nio_Buffer_klass,        java_nio_Buffer,                Opt) \
 159                                                                               \
 160   /* If this class isn't present, it won't be referenced. */                  \
 161   template(sun_misc_AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl,   Opt) \
 162                                                                               \
 163   template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \
 164                                                                               \
 165   /* Preload boxing klasses */                                                \
 166   template(boolean_klass,                java_lang_Boolean,              Pre) \
 167   template(char_klass,                   java_lang_Character,            Pre) \




 127   /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
 128   template(reflect_magic_klass,          sun_reflect_MagicAccessorImpl,  Opt) \
 129   template(reflect_method_accessor_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
 130   template(reflect_constructor_accessor_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
 131   template(reflect_delegating_classloader_klass, sun_reflect_DelegatingClassLoader, Opt) \
 132   template(reflect_constant_pool_klass,  sun_reflect_ConstantPool,       Opt_Only_JDK15) \
 133   template(reflect_unsafe_static_field_accessor_impl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
 134                                                                               \
 135   /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \
 136   template(MethodHandle_klass,           java_dyn_MethodHandle,          Opt) \
 137   template(MemberName_klass,             sun_dyn_MemberName,             Opt) \
 138   template(MethodHandleImpl_klass,       sun_dyn_MethodHandleImpl,       Opt) \
 139   template(AdapterMethodHandle_klass,    sun_dyn_AdapterMethodHandle,    Opt) \
 140   template(BoundMethodHandle_klass,      sun_dyn_BoundMethodHandle,      Opt) \
 141   template(DirectMethodHandle_klass,     sun_dyn_DirectMethodHandle,     Opt) \
 142   template(MethodType_klass,             java_dyn_MethodType,            Opt) \
 143   template(MethodTypeForm_klass,         java_dyn_MethodTypeForm,        Opt) \
 144   template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \
 145   template(Linkage_klass,                java_dyn_Linkage,               Opt) \
 146   template(CallSite_klass,               java_dyn_CallSite,              Opt) \
 147   template(InvokeDynamic_klass,          java_dyn_InvokeDynamic,         Opt) \
 148   /* Note: MethodHandle must be first, and Dynamic last in group */           \
 149                                                                               \
 150   template(vector_klass,                 java_util_Vector,               Pre) \
 151   template(hashtable_klass,              java_util_Hashtable,            Pre) \
 152   template(stringBuffer_klass,           java_lang_StringBuffer,         Pre) \
 153                                                                               \
 154   /* It's NULL in non-1.4 JDKs. */                                            \
 155   template(stackTraceElement_klass,      java_lang_StackTraceElement,    Opt) \
 156   /* Universe::is_gte_jdk14x_version() is not set up by this point. */        \
 157   /* It's okay if this turns out to be NULL in non-1.4 JDKs. */               \
 158   template(java_nio_Buffer_klass,        java_nio_Buffer,                Opt) \
 159                                                                               \
 160   /* If this class isn't present, it won't be referenced. */                  \
 161   template(sun_misc_AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl,   Opt) \
 162                                                                               \
 163   template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \
 164                                                                               \
 165   /* Preload boxing klasses */                                                \
 166   template(boolean_klass,                java_lang_Boolean,              Pre) \
 167   template(char_klass,                   java_lang_Character,            Pre) \


src/share/vm/classfile/systemDictionary.hpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File