1.1 --- a/src/share/vm/compiler/compileBroker.cpp Thu Jan 26 20:06:06 2012 -0500
1.2 +++ b/src/share/vm/compiler/compileBroker.cpp Fri Jan 27 10:42:36 2012 -0500
1.3 @@ -962,7 +962,7 @@
1.4 methodHandle hot_method,
1.5 int hot_count,
1.6 const char* comment,
1.7 - TRAPS) {
1.8 + Thread* thread) {
1.9 // do nothing if compiler thread(s) is not available
1.10 if (!_initialized ) {
1.11 return;
1.12 @@ -1038,7 +1038,7 @@
1.13
1.14 // Acquire our lock.
1.15 {
1.16 - MutexLocker locker(queue->lock(), THREAD);
1.17 + MutexLocker locker(queue->lock(), thread);
1.18
1.19 // Make sure the method has not slipped into the queues since
1.20 // last we checked; note that those checks were "fast bail-outs".
1.21 @@ -1120,7 +1120,7 @@
1.22 nmethod* CompileBroker::compile_method(methodHandle method, int osr_bci,
1.23 int comp_level,
1.24 methodHandle hot_method, int hot_count,
1.25 - const char* comment, TRAPS) {
1.26 + const char* comment, Thread* THREAD) {
1.27 // make sure arguments make sense
1.28 assert(method->method_holder()->klass_part()->oop_is_instance(), "not an instance method");
1.29 assert(osr_bci == InvocationEntryBci || (0 <= osr_bci && osr_bci < method->code_size()), "bci out of range");
1.30 @@ -1174,10 +1174,10 @@
1.31 assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
1.32 // some prerequisites that are compiler specific
1.33 if (compiler(comp_level)->is_c2() || compiler(comp_level)->is_shark()) {
1.34 - method->constants()->resolve_string_constants(CHECK_0);
1.35 + method->constants()->resolve_string_constants(CHECK_AND_CLEAR_NULL);
1.36 // Resolve all classes seen in the signature of the method
1.37 // we are compiling.
1.38 - methodOopDesc::load_signature_classes(method, CHECK_0);
1.39 + methodOopDesc::load_signature_classes(method, CHECK_AND_CLEAR_NULL);
1.40 }
1.41
1.42 // If the method is native, do the lookup in the thread requesting
1.43 @@ -1231,7 +1231,7 @@
1.44 return NULL;
1.45 }
1.46 } else {
1.47 - compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, CHECK_0);
1.48 + compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, THREAD);
1.49 }
1.50
1.51 // return requested nmethod
