1.1 --- a/src/share/vm/classfile/systemDictionary.hpp Fri Sep 02 04:28:59 2011 -0700 1.2 +++ b/src/share/vm/classfile/systemDictionary.hpp Fri Sep 02 20:58:21 2011 -0700 1.3 @@ -133,14 +133,14 @@ 1.4 template(reflect_Method_klass, java_lang_reflect_Method, Pre) \ 1.5 template(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre) \ 1.6 \ 1.7 - /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \ 1.8 - /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ 1.9 - /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ 1.10 - template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \ 1.11 - template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \ 1.12 - template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \ 1.13 - template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \ 1.14 - template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \ 1.15 + /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \ 1.16 + /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ 1.17 + /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ 1.18 + template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \ 1.19 + template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \ 1.20 + template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \ 1.21 + template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \ 1.22 + template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \ 1.23 template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \ 1.24 \ 1.25 /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \ 1.26 @@ -155,6 +155,7 @@ 1.27 template(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_JSR292) \ 1.28 template(WrongMethodTypeException_klass, java_lang_invoke_WrongMethodTypeException, Pre_JSR292) \ 1.29 template(CallSite_klass, java_lang_invoke_CallSite, Pre_JSR292) \ 1.30 + template(CountingMethodHandle_klass, java_lang_invoke_CountingMethodHandle, Opt) \ 1.31 template(ConstantCallSite_klass, java_lang_invoke_ConstantCallSite, Pre_JSR292) \ 1.32 template(MutableCallSite_klass, java_lang_invoke_MutableCallSite, Pre_JSR292) \ 1.33 template(VolatileCallSite_klass, java_lang_invoke_VolatileCallSite, Pre_JSR292) \