1.1 --- a/src/share/vm/runtime/thread.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/runtime/thread.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -37,7 +37,7 @@
1.4 #include "oops/instanceKlass.hpp"
1.5 #include "oops/objArrayOop.hpp"
1.6 #include "oops/oop.inline.hpp"
1.7 -#include "oops/symbolOop.hpp"
1.8 +#include "oops/symbol.hpp"
1.9 #include "prims/jvm_misc.hpp"
1.10 #include "prims/jvmtiExport.hpp"
1.11 #include "prims/jvmtiThreadState.hpp"
1.12 @@ -891,7 +891,7 @@
1.13 return os::create_main_thread((JavaThread*)this);
1.14 }
1.15
1.16 -static void initialize_class(symbolHandle class_name, TRAPS) {
1.17 +static void initialize_class(Symbol* class_name, TRAPS) {
1.18 klassOop klass = SystemDictionary::resolve_or_fail(class_name, true, CHECK);
1.19 instanceKlass::cast(klass)->initialize(CHECK);
1.20 }
1.21 @@ -899,7 +899,7 @@
1.22
1.23 // Creates the initial ThreadGroup
1.24 static Handle create_initial_thread_group(TRAPS) {
1.25 - klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_ThreadGroup(), true, CHECK_NH);
1.26 + klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_ThreadGroup(), true, CHECK_NH);
1.27 instanceKlassHandle klass (THREAD, k);
1.28
1.29 Handle system_instance = klass->allocate_instance_handle(CHECK_NH);
1.30 @@ -908,8 +908,8 @@
1.31 JavaCalls::call_special(&result,
1.32 system_instance,
1.33 klass,
1.34 - vmSymbolHandles::object_initializer_name(),
1.35 - vmSymbolHandles::void_method_signature(),
1.36 + vmSymbols::object_initializer_name(),
1.37 + vmSymbols::void_method_signature(),
1.38 CHECK_NH);
1.39 }
1.40 Universe::set_system_thread_group(system_instance());
1.41 @@ -921,8 +921,8 @@
1.42 JavaCalls::call_special(&result,
1.43 main_instance,
1.44 klass,
1.45 - vmSymbolHandles::object_initializer_name(),
1.46 - vmSymbolHandles::threadgroup_string_void_signature(),
1.47 + vmSymbols::object_initializer_name(),
1.48 + vmSymbols::threadgroup_string_void_signature(),
1.49 system_instance,
1.50 string,
1.51 CHECK_NH);
1.52 @@ -932,7 +932,7 @@
1.53
1.54 // Creates the initial Thread
1.55 static oop create_initial_thread(Handle thread_group, JavaThread* thread, TRAPS) {
1.56 - klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), true, CHECK_NULL);
1.57 + klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK_NULL);
1.58 instanceKlassHandle klass (THREAD, k);
1.59 instanceHandle thread_oop = klass->allocate_instance_handle(CHECK_NULL);
1.60
1.61 @@ -945,8 +945,8 @@
1.62 JavaValue result(T_VOID);
1.63 JavaCalls::call_special(&result, thread_oop,
1.64 klass,
1.65 - vmSymbolHandles::object_initializer_name(),
1.66 - vmSymbolHandles::threadgroup_string_void_signature(),
1.67 + vmSymbols::object_initializer_name(),
1.68 + vmSymbols::threadgroup_string_void_signature(),
1.69 thread_group,
1.70 string,
1.71 CHECK_NULL);
1.72 @@ -954,12 +954,12 @@
1.73 }
1.74
1.75 static void call_initializeSystemClass(TRAPS) {
1.76 - klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_System(), true, CHECK);
1.77 + klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
1.78 instanceKlassHandle klass (THREAD, k);
1.79
1.80 JavaValue result(T_VOID);
1.81 - JavaCalls::call_static(&result, klass, vmSymbolHandles::initializeSystemClass_name(),
1.82 - vmSymbolHandles::void_method_signature(), CHECK);
1.83 + JavaCalls::call_static(&result, klass, vmSymbols::initializeSystemClass_name(),
1.84 + vmSymbols::void_method_signature(), CHECK);
1.85 }
1.86
1.87 #ifdef KERNEL
1.88 @@ -973,8 +973,8 @@
1.89 }
1.90
1.91 JavaValue result(T_VOID);
1.92 - JavaCalls::call_static(&result, klass, vmSymbolHandles::setBootClassLoaderHook_name(),
1.93 - vmSymbolHandles::void_method_signature(), CHECK);
1.94 + JavaCalls::call_static(&result, klass, vmSymbols::setBootClassLoaderHook_name(),
1.95 + vmSymbols::void_method_signature(), CHECK);
1.96 }
1.97 #endif // KERNEL
1.98
1.99 @@ -985,8 +985,8 @@
1.100 instanceKlassHandle klass (THREAD, k);
1.101 if (klass.not_null()) {
1.102 JavaValue result(T_VOID);
1.103 - JavaCalls::call_static(&result, klass, vmSymbolHandles::run_method_name(),
1.104 - vmSymbolHandles::void_method_signature(),
1.105 + JavaCalls::call_static(&result, klass, vmSymbols::run_method_name(),
1.106 + vmSymbols::void_method_signature(),
1.107 CHECK);
1.108 }
1.109 }
1.110 @@ -997,7 +997,7 @@
1.111 const char *vm_info = VM_Version::vm_info_string();
1.112
1.113 // java.lang.System class
1.114 - klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_System(), true, CHECK);
1.115 + klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
1.116 instanceKlassHandle klass (THREAD, k);
1.117
1.118 // setProperty arguments
1.119 @@ -1010,8 +1010,8 @@
1.120 // public static String setProperty(String key, String value);
1.121 JavaCalls::call_static(&r,
1.122 klass,
1.123 - vmSymbolHandles::setProperty_name(),
1.124 - vmSymbolHandles::string_string_string_signature(),
1.125 + vmSymbols::setProperty_name(),
1.126 + vmSymbols::string_string_string_signature(),
1.127 key_str,
1.128 value_str,
1.129 CHECK);
1.130 @@ -1022,7 +1022,7 @@
1.131 assert(thread_group.not_null(), "thread group should be specified");
1.132 assert(threadObj() == NULL, "should only create Java thread object once");
1.133
1.134 - klassOop k = SystemDictionary::resolve_or_fail(vmSymbolHandles::java_lang_Thread(), true, CHECK);
1.135 + klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK);
1.136 instanceKlassHandle klass (THREAD, k);
1.137 instanceHandle thread_oop = klass->allocate_instance_handle(CHECK);
1.138
1.139 @@ -1037,8 +1037,8 @@
1.140 JavaCalls::call_special(&result,
1.141 thread_oop,
1.142 klass,
1.143 - vmSymbolHandles::object_initializer_name(),
1.144 - vmSymbolHandles::threadgroup_string_void_signature(),
1.145 + vmSymbols::object_initializer_name(),
1.146 + vmSymbols::threadgroup_string_void_signature(),
1.147 thread_group, // Argument 1
1.148 name, // Argument 2
1.149 THREAD);
1.150 @@ -1048,8 +1048,8 @@
1.151 JavaCalls::call_special(&result,
1.152 thread_oop,
1.153 klass,
1.154 - vmSymbolHandles::object_initializer_name(),
1.155 - vmSymbolHandles::threadgroup_runnable_void_signature(),
1.156 + vmSymbols::object_initializer_name(),
1.157 + vmSymbols::threadgroup_runnable_void_signature(),
1.158 thread_group, // Argument 1
1.159 Handle(), // Argument 2
1.160 THREAD);
1.161 @@ -1070,8 +1070,8 @@
1.162 JavaCalls::call_special(&result,
1.163 thread_group,
1.164 group,
1.165 - vmSymbolHandles::add_method_name(),
1.166 - vmSymbolHandles::thread_void_signature(),
1.167 + vmSymbols::add_method_name(),
1.168 + vmSymbols::thread_void_signature(),
1.169 threadObj, // Arg 1
1.170 THREAD);
1.171
1.172 @@ -1587,8 +1587,8 @@
1.173 CallInfo callinfo;
1.174 KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
1.175 LinkResolver::resolve_virtual_call(callinfo, threadObj, recvrKlass, thread_klass,
1.176 - vmSymbolHandles::dispatchUncaughtException_name(),
1.177 - vmSymbolHandles::throwable_void_signature(),
1.178 + vmSymbols::dispatchUncaughtException_name(),
1.179 + vmSymbols::throwable_void_signature(),
1.180 KlassHandle(), false, false, THREAD);
1.181 CLEAR_PENDING_EXCEPTION;
1.182 methodHandle method = callinfo.selected_method();
1.183 @@ -1596,8 +1596,8 @@
1.184 JavaValue result(T_VOID);
1.185 JavaCalls::call_virtual(&result,
1.186 threadObj, thread_klass,
1.187 - vmSymbolHandles::dispatchUncaughtException_name(),
1.188 - vmSymbolHandles::throwable_void_signature(),
1.189 + vmSymbols::dispatchUncaughtException_name(),
1.190 + vmSymbols::throwable_void_signature(),
1.191 uncaught_exception,
1.192 THREAD);
1.193 } else {
1.194 @@ -1605,8 +1605,8 @@
1.195 JavaValue result(T_VOID);
1.196 JavaCalls::call_virtual(&result,
1.197 group, thread_group,
1.198 - vmSymbolHandles::uncaughtException_name(),
1.199 - vmSymbolHandles::thread_throwable_void_signature(),
1.200 + vmSymbols::uncaughtException_name(),
1.201 + vmSymbols::thread_throwable_void_signature(),
1.202 threadObj, // Arg 1
1.203 uncaught_exception, // Arg 2
1.204 THREAD);
1.205 @@ -1625,8 +1625,8 @@
1.206 KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
1.207 JavaCalls::call_virtual(&result,
1.208 threadObj, thread_klass,
1.209 - vmSymbolHandles::exit_method_name(),
1.210 - vmSymbolHandles::void_method_signature(),
1.211 + vmSymbols::exit_method_name(),
1.212 + vmSymbols::void_method_signature(),
1.213 THREAD);
1.214 CLEAR_PENDING_EXCEPTION;
1.215 }
1.216 @@ -3153,7 +3153,7 @@
1.217 }
1.218
1.219 if (InitializeJavaLangString) {
1.220 - initialize_class(vmSymbolHandles::java_lang_String(), CHECK_0);
1.221 + initialize_class(vmSymbols::java_lang_String(), CHECK_0);
1.222 } else {
1.223 warning("java.lang.String not initialized");
1.224 }
1.225 @@ -3163,10 +3163,10 @@
1.226 // Forcibly initialize java/util/HashMap and mutate the private
1.227 // static final "frontCacheEnabled" field before we start creating instances
1.228 #ifdef ASSERT
1.229 - klassOop tmp_k = SystemDictionary::find(vmSymbolHandles::java_util_HashMap(), Handle(), Handle(), CHECK_0);
1.230 + klassOop tmp_k = SystemDictionary::find(vmSymbols::java_util_HashMap(), Handle(), Handle(), CHECK_0);
1.231 assert(tmp_k == NULL, "java/util/HashMap should not be loaded yet");
1.232 #endif
1.233 - klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_util_HashMap(), Handle(), Handle(), CHECK_0);
1.234 + klassOop k_o = SystemDictionary::resolve_or_null(vmSymbols::java_util_HashMap(), Handle(), Handle(), CHECK_0);
1.235 KlassHandle k = KlassHandle(THREAD, k_o);
1.236 guarantee(k.not_null(), "Must find java/util/HashMap");
1.237 instanceKlassHandle ik = instanceKlassHandle(THREAD, k());
1.238 @@ -3181,7 +3181,7 @@
1.239 if (UseStringCache) {
1.240 // Forcibly initialize java/lang/StringValue and mutate the private
1.241 // static final "stringCacheEnabled" field before we start creating instances
1.242 - klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_StringValue(), Handle(), Handle(), CHECK_0);
1.243 + klassOop k_o = SystemDictionary::resolve_or_null(vmSymbols::java_lang_StringValue(), Handle(), Handle(), CHECK_0);
1.244 // Possible that StringValue isn't present: if so, silently don't break
1.245 if (k_o != NULL) {
1.246 KlassHandle k = KlassHandle(THREAD, k_o);
1.247 @@ -3198,11 +3198,11 @@
1.248
1.249 // Initialize java_lang.System (needed before creating the thread)
1.250 if (InitializeJavaLangSystem) {
1.251 - initialize_class(vmSymbolHandles::java_lang_System(), CHECK_0);
1.252 - initialize_class(vmSymbolHandles::java_lang_ThreadGroup(), CHECK_0);
1.253 + initialize_class(vmSymbols::java_lang_System(), CHECK_0);
1.254 + initialize_class(vmSymbols::java_lang_ThreadGroup(), CHECK_0);
1.255 Handle thread_group = create_initial_thread_group(CHECK_0);
1.256 Universe::set_main_thread_group(thread_group());
1.257 - initialize_class(vmSymbolHandles::java_lang_Thread(), CHECK_0);
1.258 + initialize_class(vmSymbols::java_lang_Thread(), CHECK_0);
1.259 oop thread_object = create_initial_thread(thread_group, main_thread, CHECK_0);
1.260 main_thread->set_threadObj(thread_object);
1.261 // Set thread status to running since main thread has
1.262 @@ -3211,10 +3211,10 @@
1.263 java_lang_Thread::RUNNABLE);
1.264
1.265 // The VM preresolve methods to these classes. Make sure that get initialized
1.266 - initialize_class(vmSymbolHandles::java_lang_reflect_Method(), CHECK_0);
1.267 - initialize_class(vmSymbolHandles::java_lang_ref_Finalizer(), CHECK_0);
1.268 + initialize_class(vmSymbols::java_lang_reflect_Method(), CHECK_0);
1.269 + initialize_class(vmSymbols::java_lang_ref_Finalizer(), CHECK_0);
1.270 // The VM creates & returns objects of this class. Make sure it's initialized.
1.271 - initialize_class(vmSymbolHandles::java_lang_Class(), CHECK_0);
1.272 + initialize_class(vmSymbols::java_lang_Class(), CHECK_0);
1.273 call_initializeSystemClass(CHECK_0);
1.274 } else {
1.275 warning("java.lang.System not initialized");
1.276 @@ -3222,13 +3222,13 @@
1.277
1.278 // an instance of OutOfMemory exception has been allocated earlier
1.279 if (InitializeJavaLangExceptionsErrors) {
1.280 - initialize_class(vmSymbolHandles::java_lang_OutOfMemoryError(), CHECK_0);
1.281 - initialize_class(vmSymbolHandles::java_lang_NullPointerException(), CHECK_0);
1.282 - initialize_class(vmSymbolHandles::java_lang_ClassCastException(), CHECK_0);
1.283 - initialize_class(vmSymbolHandles::java_lang_ArrayStoreException(), CHECK_0);
1.284 - initialize_class(vmSymbolHandles::java_lang_ArithmeticException(), CHECK_0);
1.285 - initialize_class(vmSymbolHandles::java_lang_StackOverflowError(), CHECK_0);
1.286 - initialize_class(vmSymbolHandles::java_lang_IllegalMonitorStateException(), CHECK_0);
1.287 + initialize_class(vmSymbols::java_lang_OutOfMemoryError(), CHECK_0);
1.288 + initialize_class(vmSymbols::java_lang_NullPointerException(), CHECK_0);
1.289 + initialize_class(vmSymbols::java_lang_ClassCastException(), CHECK_0);
1.290 + initialize_class(vmSymbols::java_lang_ArrayStoreException(), CHECK_0);
1.291 + initialize_class(vmSymbols::java_lang_ArithmeticException(), CHECK_0);
1.292 + initialize_class(vmSymbols::java_lang_StackOverflowError(), CHECK_0);
1.293 + initialize_class(vmSymbols::java_lang_IllegalMonitorStateException(), CHECK_0);
1.294 } else {
1.295 warning("java.lang.OutOfMemoryError has not been initialized");
1.296 warning("java.lang.NullPointerException has not been initialized");
1.297 @@ -3254,7 +3254,7 @@
1.298 // Future Fix : the best fix is to grant everyone permissions to read "java.compiler" and
1.299 // read and write"java.vm.info" in the default policy file. See bugid 4211383
1.300 // Once that is done, we should remove this hack.
1.301 - initialize_class(vmSymbolHandles::java_lang_Compiler(), CHECK_0);
1.302 + initialize_class(vmSymbols::java_lang_Compiler(), CHECK_0);
1.303
1.304 // More hackery - the static initializer of java.lang.Compiler adds the string "nojit" to
1.305 // the java.vm.info property if no jit gets loaded through java.lang.Compiler (the hotspot
1.306 @@ -3580,7 +3580,7 @@
1.307
1.308 EXCEPTION_MARK;
1.309 klassOop k =
1.310 - SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_Shutdown(),
1.311 + SystemDictionary::resolve_or_null(vmSymbols::java_lang_Shutdown(),
1.312 THREAD);
1.313 if (k != NULL) {
1.314 // SystemDictionary::resolve_or_null will return null if there was
1.315 @@ -3594,8 +3594,8 @@
1.316 JavaValue result(T_VOID);
1.317 JavaCalls::call_static(&result,
1.318 shutdown_klass,
1.319 - vmSymbolHandles::shutdown_method_name(),
1.320 - vmSymbolHandles::void_method_signature(),
1.321 + vmSymbols::shutdown_method_name(),
1.322 + vmSymbols::void_method_signature(),
1.323 THREAD);
1.324 }
1.325 CLEAR_PENDING_EXCEPTION;
