From 666e209e797c1967e4d82885ad3b2acdca2f5316 Mon Sep 17 00:00:00 2001 From: twisti Date: Thu, 11 Oct 2012 14:46:20 -0700 Subject: [PATCH] 8000740: remove LinkWellKnownClasses Reviewed-by: kvn, jrose --- src/share/vm/classfile/classFileParser.cpp | 7 +- src/share/vm/classfile/classFileParser.hpp | 2 +- src/share/vm/classfile/systemDictionary.cpp | 76 ------------- src/share/vm/classfile/systemDictionary.hpp | 115 ++++++++++---------- src/share/vm/prims/methodHandles.cpp | 9 -- src/share/vm/runtime/globals.hpp | 3 - 6 files changed, 57 insertions(+), 155 deletions(-) diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp index 6b2a2f538..28ca903a6 100644 --- a/src/share/vm/classfile/classFileParser.cpp +++ b/src/share/vm/classfile/classFileParser.cpp @@ -816,9 +816,6 @@ Array* ClassFileParser::parse_interfaces(constantPoolHandle cp, unresolved_klass, class_loader, protection_domain, false, CHECK_NULL); interf = KlassHandle(THREAD, k); - - if (LinkWellKnownClasses) // my super type is well known to me - cp->klass_at_put(interface_index, interf()); // eagerly resolve } if (!Klass::cast(interf())->is_interface()) { @@ -3197,8 +3194,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, KlassHandle kh (THREAD, k); super_klass = instanceKlassHandle(THREAD, kh()); - if (LinkWellKnownClasses) // my super class is well known to me - cp->klass_at_put(super_class_index, super_klass()); // eagerly resolve } if (super_klass.not_null()) { if (super_klass->is_interface()) { @@ -3644,7 +3639,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name, // has to be changed accordingly. this_klass->set_initial_method_idnum(methods->length()); this_klass->set_name(cp->klass_name_at(this_class_index)); - if (LinkWellKnownClasses || is_anonymous()) // I am well known to myself + if (is_anonymous()) // I am well known to myself cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve if (fields_annotations != NULL || diff --git a/src/share/vm/classfile/classFileParser.hpp b/src/share/vm/classfile/classFileParser.hpp index 17106125a..04111eb00 100644 --- a/src/share/vm/classfile/classFileParser.hpp +++ b/src/share/vm/classfile/classFileParser.hpp @@ -344,7 +344,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC { // constant pool construction, but in later versions they can. // %%% Let's phase out the old is_klass_reference. bool is_klass_reference(constantPoolHandle cp, int index) { - return ((LinkWellKnownClasses || EnableInvokeDynamic) + return (EnableInvokeDynamic ? cp->tag_at(index).is_klass_or_reference() : cp->tag_at(index).is_klass_reference()); } diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp index 8ccad8e4a..5f1fdf504 100644 --- a/src/share/vm/classfile/systemDictionary.cpp +++ b/src/share/vm/classfile/systemDictionary.cpp @@ -291,16 +291,6 @@ Klass* SystemDictionary::resolve_super_or_fail(Symbol* child_name, Handle protection_domain, bool is_superclass, TRAPS) { - - // Try to get one of the well-known klasses. - // They are trusted, and do not participate in circularities. - if (LinkWellKnownClasses) { - Klass* k = find_well_known_klass(class_name); - if (k != NULL) { - return k; - } - } - // Double-check, if child class is already loaded, just return super-class,interface // Don't add a placedholder if already loaded, i.e. already in system dictionary // Make sure there's a placeholder for the *child* before resolving. @@ -926,14 +916,6 @@ Klass* SystemDictionary::find_instance_or_array_klass(Symbol* class_name, Klass* k = NULL; assert(class_name != NULL, "class name must be non NULL"); - // Try to get one of the well-known klasses. - if (LinkWellKnownClasses) { - k = find_well_known_klass(class_name); - if (k != NULL) { - return k; - } - } - if (FieldType::is_array(class_name)) { // The name refers to an array. Parse the name. // dimension and object_key in FieldArrayInfo are assigned as a @@ -954,41 +936,6 @@ Klass* SystemDictionary::find_instance_or_array_klass(Symbol* class_name, return k; } -// Quick range check for names of well-known classes: -static Symbol* wk_klass_name_limits[2] = {NULL, NULL}; - -#ifndef PRODUCT -static int find_wkk_calls, find_wkk_probes, find_wkk_wins; -// counts for "hello world": 3983, 1616, 1075 -// => 60% hit after limit guard, 25% total win rate -#endif - -Klass* SystemDictionary::find_well_known_klass(Symbol* class_name) { - // A bounds-check on class_name will quickly get a negative result. - NOT_PRODUCT(find_wkk_calls++); - if (class_name >= wk_klass_name_limits[0] && - class_name <= wk_klass_name_limits[1]) { - NOT_PRODUCT(find_wkk_probes++); - vmSymbols::SID sid = vmSymbols::find_sid(class_name); - if (sid != vmSymbols::NO_SID) { - Klass* k = NULL; - switch (sid) { - #define WK_KLASS_CASE(name, symbol, option) \ - case vmSymbols::VM_SYMBOL_ENUM_NAME(symbol): \ - if (option == Pre_Link) { \ - k = WK_KLASS(name); \ - } \ - break; - WK_KLASSES_DO(WK_KLASS_CASE) - #undef WK_KLASS_CASE - } - NOT_PRODUCT(if (k != NULL) find_wkk_wins++); - return k; - } - } - return NULL; -} - // Note: this method is much like resolve_from_stream, but // updates no supplemental data structures. // TODO consolidate the two methods with a helper routine? @@ -1942,33 +1889,12 @@ void SystemDictionary::initialize_wk_klasses_until(WKID limit_id, WKID &start_id int opt = (info & right_n_bits(CEIL_LG_OPTION_LIMIT)); initialize_wk_klass((WKID)id, opt, CHECK); - - // Update limits, so find_well_known_klass can be very fast: - Symbol* s = vmSymbols::symbol_at((vmSymbols::SID)sid); - if (wk_klass_name_limits[1] == NULL) { - wk_klass_name_limits[0] = wk_klass_name_limits[1] = s; - } else if (wk_klass_name_limits[1] < s) { - wk_klass_name_limits[1] = s; - } else if (wk_klass_name_limits[0] > s) { - wk_klass_name_limits[0] = s; - } } // move the starting value forward to the limit: start_id = limit_id; } -#ifdef ASSERT -void SystemDictionary::check_wk_pre_link_klasses() { - #define WK_KLASS_CHECK(name, symbol, option) \ - if (option == Pre_Link) { \ - assert(name()->is_public(), ""); \ - } - WK_KLASSES_DO(WK_KLASS_CHECK); - #undef WK_KLASS_CHECK -} -#endif - void SystemDictionary::initialize_preloaded_classes(TRAPS) { assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once"); // Preload commonly used klasses @@ -2023,8 +1949,6 @@ void SystemDictionary::initialize_preloaded_classes(TRAPS) { initialize_wk_klasses_until(WKID_LIMIT, scan, CHECK); - check_wk_pre_link_klasses(); - _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass); _box_klasses[T_CHAR] = WK_KLASS(Character_klass); _box_klasses[T_FLOAT] = WK_KLASS(Float_klass); diff --git a/src/share/vm/classfile/systemDictionary.hpp b/src/share/vm/classfile/systemDictionary.hpp index 29dd4e0cc..19ddbe9c9 100644 --- a/src/share/vm/classfile/systemDictionary.hpp +++ b/src/share/vm/classfile/systemDictionary.hpp @@ -94,45 +94,45 @@ class SymbolPropertyTable; #define WK_KLASSES_DO(do_klass) \ /* well-known classes */ \ - do_klass(Object_klass, java_lang_Object, Pre_Link ) \ - do_klass(String_klass, java_lang_String, Pre_Link ) \ - do_klass(Class_klass, java_lang_Class, Pre_Link ) \ - do_klass(Cloneable_klass, java_lang_Cloneable, Pre_Link ) \ - do_klass(ClassLoader_klass, java_lang_ClassLoader, Pre_Link ) \ - do_klass(Serializable_klass, java_io_Serializable, Pre_Link ) \ - do_klass(System_klass, java_lang_System, Pre_Link ) \ - do_klass(Throwable_klass, java_lang_Throwable, Pre_Link ) \ - do_klass(Error_klass, java_lang_Error, Pre_Link ) \ - do_klass(ThreadDeath_klass, java_lang_ThreadDeath, Pre_Link ) \ - do_klass(Exception_klass, java_lang_Exception, Pre_Link ) \ - do_klass(RuntimeException_klass, java_lang_RuntimeException, Pre_Link ) \ - do_klass(ProtectionDomain_klass, java_security_ProtectionDomain, Pre_Link ) \ - do_klass(AccessControlContext_klass, java_security_AccessControlContext, Pre_Link ) \ - do_klass(ClassNotFoundException_klass, java_lang_ClassNotFoundException, Pre_Link ) \ - do_klass(NoClassDefFoundError_klass, java_lang_NoClassDefFoundError, Pre_Link ) \ - do_klass(LinkageError_klass, java_lang_LinkageError, Pre_Link ) \ - do_klass(ClassCastException_klass, java_lang_ClassCastException, Pre_Link ) \ - do_klass(ArrayStoreException_klass, java_lang_ArrayStoreException, Pre_Link ) \ - do_klass(VirtualMachineError_klass, java_lang_VirtualMachineError, Pre_Link ) \ - do_klass(OutOfMemoryError_klass, java_lang_OutOfMemoryError, Pre_Link ) \ - do_klass(StackOverflowError_klass, java_lang_StackOverflowError, Pre_Link ) \ - do_klass(IllegalMonitorStateException_klass, java_lang_IllegalMonitorStateException, Pre_Link ) \ - do_klass(Reference_klass, java_lang_ref_Reference, Pre_Link ) \ + do_klass(Object_klass, java_lang_Object, Pre ) \ + do_klass(String_klass, java_lang_String, Pre ) \ + do_klass(Class_klass, java_lang_Class, Pre ) \ + do_klass(Cloneable_klass, java_lang_Cloneable, Pre ) \ + do_klass(ClassLoader_klass, java_lang_ClassLoader, Pre ) \ + do_klass(Serializable_klass, java_io_Serializable, Pre ) \ + do_klass(System_klass, java_lang_System, Pre ) \ + do_klass(Throwable_klass, java_lang_Throwable, Pre ) \ + do_klass(Error_klass, java_lang_Error, Pre ) \ + do_klass(ThreadDeath_klass, java_lang_ThreadDeath, Pre ) \ + do_klass(Exception_klass, java_lang_Exception, Pre ) \ + do_klass(RuntimeException_klass, java_lang_RuntimeException, Pre ) \ + do_klass(ProtectionDomain_klass, java_security_ProtectionDomain, Pre ) \ + do_klass(AccessControlContext_klass, java_security_AccessControlContext, Pre ) \ + do_klass(ClassNotFoundException_klass, java_lang_ClassNotFoundException, Pre ) \ + do_klass(NoClassDefFoundError_klass, java_lang_NoClassDefFoundError, Pre ) \ + do_klass(LinkageError_klass, java_lang_LinkageError, Pre ) \ + do_klass(ClassCastException_klass, java_lang_ClassCastException, Pre ) \ + do_klass(ArrayStoreException_klass, java_lang_ArrayStoreException, Pre ) \ + do_klass(VirtualMachineError_klass, java_lang_VirtualMachineError, Pre ) \ + do_klass(OutOfMemoryError_klass, java_lang_OutOfMemoryError, Pre ) \ + do_klass(StackOverflowError_klass, java_lang_StackOverflowError, Pre ) \ + do_klass(IllegalMonitorStateException_klass, java_lang_IllegalMonitorStateException, Pre ) \ + do_klass(Reference_klass, java_lang_ref_Reference, Pre ) \ \ /* Preload ref klasses and set reference types */ \ - do_klass(SoftReference_klass, java_lang_ref_SoftReference, Pre_Link ) \ - do_klass(WeakReference_klass, java_lang_ref_WeakReference, Pre_Link ) \ + do_klass(SoftReference_klass, java_lang_ref_SoftReference, Pre ) \ + do_klass(WeakReference_klass, java_lang_ref_WeakReference, Pre ) \ do_klass(FinalReference_klass, java_lang_ref_FinalReference, Pre ) \ - do_klass(PhantomReference_klass, java_lang_ref_PhantomReference, Pre_Link ) \ + do_klass(PhantomReference_klass, java_lang_ref_PhantomReference, Pre ) \ do_klass(Finalizer_klass, java_lang_ref_Finalizer, Pre ) \ \ - do_klass(Thread_klass, java_lang_Thread, Pre_Link ) \ - do_klass(ThreadGroup_klass, java_lang_ThreadGroup, Pre_Link ) \ - do_klass(Properties_klass, java_util_Properties, Pre_Link ) \ - do_klass(reflect_AccessibleObject_klass, java_lang_reflect_AccessibleObject, Pre_Link ) \ - do_klass(reflect_Field_klass, java_lang_reflect_Field, Pre_Link ) \ - do_klass(reflect_Method_klass, java_lang_reflect_Method, Pre_Link ) \ - do_klass(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre_Link ) \ + do_klass(Thread_klass, java_lang_Thread, Pre ) \ + do_klass(ThreadGroup_klass, java_lang_ThreadGroup, Pre ) \ + do_klass(Properties_klass, java_util_Properties, Pre ) \ + do_klass(reflect_AccessibleObject_klass, java_lang_reflect_AccessibleObject, Pre ) \ + do_klass(reflect_Field_klass, java_lang_reflect_Field, Pre ) \ + do_klass(reflect_Method_klass, java_lang_reflect_Method, Pre ) \ + do_klass(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre ) \ \ /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \ /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \ @@ -145,20 +145,20 @@ class SymbolPropertyTable; do_klass(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15 ) \ \ /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \ - do_klass(MethodHandle_klass, java_lang_invoke_MethodHandle, Pre_Link ) \ - do_klass(MemberName_klass, java_lang_invoke_MemberName, Pre ) \ - do_klass(MethodHandleNatives_klass, java_lang_invoke_MethodHandleNatives, Pre ) \ + do_klass(MethodHandle_klass, java_lang_invoke_MethodHandle, Pre_JSR292 ) \ + do_klass(MemberName_klass, java_lang_invoke_MemberName, Pre_JSR292 ) \ + do_klass(MethodHandleNatives_klass, java_lang_invoke_MethodHandleNatives, Pre_JSR292 ) \ do_klass(LambdaForm_klass, java_lang_invoke_LambdaForm, Opt ) \ - do_klass(MethodType_klass, java_lang_invoke_MethodType, Pre_Link ) \ - do_klass(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_Link ) \ - do_klass(CallSite_klass, java_lang_invoke_CallSite, Pre_Link ) \ - do_klass(ConstantCallSite_klass, java_lang_invoke_ConstantCallSite, Pre_Link ) \ - do_klass(MutableCallSite_klass, java_lang_invoke_MutableCallSite, Pre_Link ) \ - do_klass(VolatileCallSite_klass, java_lang_invoke_VolatileCallSite, Pre_Link ) \ + do_klass(MethodType_klass, java_lang_invoke_MethodType, Pre_JSR292 ) \ + do_klass(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_JSR292 ) \ + do_klass(CallSite_klass, java_lang_invoke_CallSite, Pre_JSR292 ) \ + do_klass(ConstantCallSite_klass, java_lang_invoke_ConstantCallSite, Pre_JSR292 ) \ + do_klass(MutableCallSite_klass, java_lang_invoke_MutableCallSite, Pre_JSR292 ) \ + do_klass(VolatileCallSite_klass, java_lang_invoke_VolatileCallSite, Pre_JSR292 ) \ /* Note: MethodHandle must be first, and VolatileCallSite last in group */ \ \ - do_klass(StringBuffer_klass, java_lang_StringBuffer, Pre_Link ) \ - do_klass(StringBuilder_klass, java_lang_StringBuilder, Pre_Link ) \ + do_klass(StringBuffer_klass, java_lang_StringBuffer, Pre ) \ + do_klass(StringBuilder_klass, java_lang_StringBuilder, Pre ) \ \ /* It's NULL in non-1.4 JDKs. */ \ do_klass(StackTraceElement_klass, java_lang_StackTraceElement, Opt ) \ @@ -171,14 +171,14 @@ class SymbolPropertyTable; do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \ \ /* Preload boxing klasses */ \ - do_klass(Boolean_klass, java_lang_Boolean, Pre_Link ) \ - do_klass(Character_klass, java_lang_Character, Pre_Link ) \ - do_klass(Float_klass, java_lang_Float, Pre_Link ) \ - do_klass(Double_klass, java_lang_Double, Pre_Link ) \ - do_klass(Byte_klass, java_lang_Byte, Pre_Link ) \ - do_klass(Short_klass, java_lang_Short, Pre_Link ) \ - do_klass(Integer_klass, java_lang_Integer, Pre_Link ) \ - do_klass(Long_klass, java_lang_Long, Pre_Link ) \ + do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ + do_klass(Character_klass, java_lang_Character, Pre ) \ + do_klass(Float_klass, java_lang_Float, Pre ) \ + do_klass(Double_klass, java_lang_Double, Pre ) \ + do_klass(Byte_klass, java_lang_Byte, Pre ) \ + do_klass(Short_klass, java_lang_Short, Pre ) \ + do_klass(Integer_klass, java_lang_Integer, Pre ) \ + do_klass(Long_klass, java_lang_Long, Pre ) \ /*end*/ @@ -201,7 +201,7 @@ class SystemDictionary : AllStatic { enum InitOption { Pre, // preloaded; error if not present - Pre_Link, // preloaded; error if not present; link as well-known + Pre_JSR292, // preloaded if EnableInvokeDynamic // Order is significant. Options before this point require resolve_or_fail. // Options after this point will use resolve_or_null instead. @@ -280,9 +280,6 @@ public: Handle protection_domain, TRAPS); - // If the given name is known to vmSymbols, return the well-know klass: - static Klass* find_well_known_klass(Symbol* class_name); - // Lookup an instance or array class that has already been loaded // either into the given class loader, or else into another class // loader that is constrained (via loader constraints) to produce @@ -393,7 +390,7 @@ public: } static Klass* check_klass_Pre( Klass* k) { return check_klass(k); } - static Klass* check_klass_Pre_Link( Klass* k) { return check_klass(k); } + static Klass* check_klass_Pre_JSR292(Klass* k) { return EnableInvokeDynamic ? check_klass(k) : k; } static Klass* check_klass_Opt( Klass* k) { return k; } static Klass* check_klass_Opt_Kernel(Klass* k) { return k; } //== Opt static Klass* check_klass_Opt_Only_JDK15(Klass* k) { @@ -413,8 +410,6 @@ public: initialize_wk_klasses_until((WKID) limit, start_id, THREAD); } - static void check_wk_pre_link_klasses() NOT_DEBUG_RETURN; - public: #define WK_KLASS_DECLARE(name, symbol, option) \ static Klass* name() { return check_klass_##option(_well_known_klasses[WK_KLASS_ENUM_NAME(name)]); } \ diff --git a/src/share/vm/prims/methodHandles.cpp b/src/share/vm/prims/methodHandles.cpp index 98d379b67..bd587439b 100644 --- a/src/share/vm/prims/methodHandles.cpp +++ b/src/share/vm/prims/methodHandles.cpp @@ -563,15 +563,6 @@ static oop field_signature_type_or_null(Symbol* s) { return Klass::cast(SystemDictionary::Class_klass())->java_mirror(); } else if (s == vmSymbols::string_signature()) { return Klass::cast(SystemDictionary::String_klass())->java_mirror(); - } else { - int len = s->utf8_length(); - if (s->byte_at(0) == 'L' && s->byte_at(len-1) == ';') { - TempNewSymbol cname = SymbolTable::probe((const char*)&s->bytes()[1], len-2); - if (cname == NULL) return NULL; - Klass* wkk = SystemDictionary::find_well_known_klass(cname); - if (wkk == NULL) return NULL; - return Klass::cast(wkk)->java_mirror(); - } } } return NULL; diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp index 30df54798..c4b438f7d 100644 --- a/src/share/vm/runtime/globals.hpp +++ b/src/share/vm/runtime/globals.hpp @@ -1000,9 +1000,6 @@ class CommandLineFlags { product(bool, ClassUnloading, true, \ "Do unloading of classes") \ \ - diagnostic(bool, LinkWellKnownClasses, true, \ - "Resolve a well known class as soon as its name is seen") \ - \ develop(bool, DisableStartThread, false, \ "Disable starting of additional Java threads " \ "(for debugging only)") \ -- GitLab