src/share/vm/utilities/vmError.cpp

rev 12310 : [mq]: gcinterface.patch

@@ -753,11 +753,11 @@
      }
 
   STEP("printing heap information")
 
      if (_verbose && Universe::is_fully_initialized()) {
-       Universe::heap()->print_on_error(st);
+       GC::gc()->heap()->print_on_error(st);
        st->cr();
        st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));
        st->cr();
      }
 

@@ -930,11 +930,11 @@
 
   // STEP("printing heap information")
 
   if (Universe::is_fully_initialized()) {
     MutexLocker hl(Heap_lock);
-    Universe::heap()->print_on_error(st);
+    GC::gc()->heap()->print_on_error(st);
     st->cr();
     st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));
     st->cr();
   }
 

@@ -1384,11 +1384,11 @@
   tty->print_cr("#");
   tty->print_cr("# java.lang.OutOfMemoryError: %s", _message);
   tty->print_cr("# -XX:OnOutOfMemoryError=\"%s\"", OnOutOfMemoryError);
 
   // make heap parsability
-  Universe::heap()->ensure_parsability(false);  // no need to retire TLABs
+  GC::gc()->heap()->ensure_parsability(false);  // no need to retire TLABs
 
   char* cmd;
   const char* ptr = OnOutOfMemoryError;
   while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
     tty->print("#   Executing ");