src/share/vm/oops/klass.cpp

rev 11777 : [mq]: gcinterface.patch

@@ -452,12 +452,12 @@
   }
 #endif
 }
 
 void Klass::klass_oop_store(oop* p, oop v) {
-  assert(!Universe::heap()->is_in_reserved((void*)p), "Should store pointer into metadata");
-  assert(v == NULL || Universe::heap()->is_in_reserved((void*)v), "Should store pointer to an object");
+  assert(!GC::gc()->heap()->is_in_reserved((void*)p), "Should store pointer into metadata");
+  assert(v == NULL || GC::gc()->heap()->is_in_reserved((void*)v), "Should store pointer to an object");
 
   // do the store
   if (always_do_update_barrier) {
     klass_oop_store((volatile oop*)p, v);
   } else {

@@ -466,12 +466,12 @@
     klass_update_barrier_set(v);
   }
 }
 
 void Klass::klass_oop_store(volatile oop* p, oop v) {
-  assert(!Universe::heap()->is_in_reserved((void*)p), "Should store pointer into metadata");
-  assert(v == NULL || Universe::heap()->is_in_reserved((void*)v), "Should store pointer to an object");
+  assert(!GC::gc()->heap()->is_in_reserved((void*)p), "Should store pointer into metadata");
+  assert(v == NULL || GC::gc()->heap()->is_in_reserved((void*)v), "Should store pointer to an object");
 
   klass_update_barrier_set_pre((oop*)p, v); // Cast away volatile.
   OrderAccess::release_store_ptr(p, v);
   klass_update_barrier_set(v);
 }