src/share/vm/runtime/frame.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -886,11 +886,11 @@
   assert(map != NULL, "map must be set");
   Thread *thread = Thread::current();
   methodHandle m (thread, interpreter_frame_method());
   jint      bci = interpreter_frame_bci();
 
-  assert(!Universe::heap()->is_in(m()),
+  assert(!GC::gc()->heap()->is_in(m()),
           "must be valid oop");
   assert(m->is_method(), "checking frame value");
   assert((m->is_native() && bci == 0)  ||
          (!m->is_native() && bci >= 0 && bci < m->code_size()),
          "invalid bci value");

@@ -1065,11 +1065,11 @@
   if (oop_adr == NULL) {
     guarantee(oop_adr != NULL, "bad register save location");
     return NULL;
   }
   oop r = *oop_adr;
-  assert(Universe::heap()->is_in_or_null(r), "bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", p2i(r), p2i(r));
+  assert(GC::gc()->heap()->is_in_or_null(r), "bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", p2i(r), p2i(r));
   return r;
 }
 
 
 oop* frame::oopmapreg_to_location(VMReg reg, const RegisterMap* reg_map) const {

@@ -1096,11 +1096,11 @@
   assert(_cb != NULL && _cb->is_nmethod() && nm->method()->is_native(),
          "Should not call this unless it's a native nmethod");
   int byte_offset = in_bytes(nm->native_receiver_sp_offset());
   assert(byte_offset >= 0, "should not see invalid offset");
   oop owner = ((oop*) sp())[byte_offset / wordSize];
-  assert( Universe::heap()->is_in(owner), "bad receiver" );
+  assert( GC::gc()->heap()->is_in(owner), "bad receiver" );
   return owner;
 }
 
 void frame::oops_entry_do(OopClosure* f, const RegisterMap* map) {
   assert(map != NULL, "map must be set");