diff src/share/vm/compiler/compileBroker.cpp @ 1931:48bbaead8b6c

Adjustments after merge with OpenJDK repository.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 16:39:35 +0100
parents 2d26b0046e0d
children b7fb5f1e0747
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp	Tue Nov 30 14:53:30 2010 +0100
+++ b/src/share/vm/compiler/compileBroker.cpp	Tue Nov 30 16:39:35 2010 +0100
@@ -531,7 +531,7 @@
 
   instanceKlass* klass = (instanceKlass*)SystemDictionary::Object_klass()->klass_part();
   methodOop method = klass->find_method(vmSymbols::object_initializer_name(), vmSymbols::void_method_signature());
-  CompileBroker::compile_method(method, -1, method, 0, "initial compile of object initializer", THREAD);
+  CompileBroker::compile_method(method, -1, 0, method, 0, "initial compile of object initializer", THREAD);
   if (HAS_PENDING_EXCEPTION) {
     CLEAR_PENDING_EXCEPTION;
     fatal("error inserting object initializer into compile queue");
@@ -542,8 +542,8 @@
     {
       HandleMark hm;
       ResourceMark rm;
-      MutexLocker locker(_method_queue->lock(), Thread::current());
-      if (_method_queue->is_empty()) {
+      MutexLocker locker(_c1_method_queue->lock(), Thread::current());
+      if (_c1_method_queue->is_empty()) {
         MutexLocker mu(Threads_lock); // grab Threads_lock
         JavaThread* current = Threads::first();
         bool compiling = false;
@@ -565,7 +565,7 @@
         }
       }
       if (TraceC1X >= 4) {
-        _method_queue->print();
+        _c1_method_queue->print();
       }
     }