src/share/vm/prims/jvmtiTagMap.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -1247,11 +1247,11 @@
   void doit() {
     // allows class files maps to be cached during iteration
     ClassFieldMapCacheMark cm;
 
     // make sure that heap is parsable (fills TLABs with filler objects)
-    Universe::heap()->ensure_parsability(false);  // no need to retire TLABs
+    GC::gc()->heap()->ensure_parsability(false);  // no need to retire TLABs
 
     // Verify heap before iteration - if the heap gets corrupted then
     // JVMTI's IterateOverHeap will crash.
     if (VerifyBeforeIteration) {
       Universe::verify();

@@ -1259,11 +1259,11 @@
 
     // do the iteration
     // If this operation encounters a bad object when using CMS,
     // consider using safe_object_iterate() which avoids perm gen
     // objects that may contain bad references.
-    Universe::heap()->object_iterate(_blk);
+    GC::gc()->heap()->object_iterate(_blk);
   }
 
 };
 
 

@@ -1532,11 +1532,11 @@
   //
   void do_entry(JvmtiTagHashmapEntry* entry) {
     for (int i=0; i<_tag_count; i++) {
       if (_tags[i] == entry->tag()) {
         oop o = entry->object();
-        assert(o != NULL && Universe::heap()->is_in_reserved(o), "sanity check");
+        assert(o != NULL && GC::gc()->heap()->is_in_reserved(o), "sanity check");
 #if INCLUDE_ALL_GCS
         if (UseG1GC) {
           // The reference in this tag map could be the only (implicitly weak)
           // reference to that object. If we hand it out, we need to keep it live wrt
           // SATB marking similar to other j.l.ref.Reference referents.

@@ -1659,11 +1659,11 @@
 // initialize ObjectMarker - prepares for object marking
 void ObjectMarker::init() {
   assert(Thread::current()->is_VM_thread(), "must be VMThread");
 
   // prepare heap for iteration
-  Universe::heap()->ensure_parsability(false);  // no need to retire TLABs
+  GC::gc()->heap()->ensure_parsability(false);  // no need to retire TLABs
 
   // create stacks for interesting headers
   _saved_mark_stack = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<markOop>(4000, true);
   _saved_oop_stack = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<oop>(4000, true);
 

@@ -1676,11 +1676,11 @@
 void ObjectMarker::done() {
   // iterate over all objects and restore the mark bits to
   // their initial value
   RestoreMarksClosure blk;
   if (needs_reset()) {
-    Universe::heap()->object_iterate(&blk);
+    GC::gc()->heap()->object_iterate(&blk);
   } else {
     // We don't need to reset mark bits on this call, but reset the
     // flag to the default for the next call.
     set_needs_reset(true);
   }

@@ -1701,11 +1701,11 @@
   delete _saved_mark_stack;
 }
 
 // mark an object
 inline void ObjectMarker::mark(oop o) {
-  assert(Universe::heap()->is_in(o), "sanity check");
+  assert(GC::gc()->heap()->is_in(o), "sanity check");
   assert(!o->mark()->is_marked(), "should only mark an object once");
 
   // object's mark word
   markOop mark = o->mark();
 

@@ -2582,11 +2582,11 @@
     oop o = *obj_p;
     if (o == NULL || o == JNIHandles::deleted_handle()) {
       return;
     }
 
-    assert(Universe::heap()->is_in_reserved(o), "should be impossible");
+    assert(GC::gc()->heap()->is_in_reserved(o), "should be impossible");
 
     jvmtiHeapReferenceKind kind = root_kind();
     if (kind == JVMTI_HEAP_REFERENCE_SYSTEM_CLASS) {
       // SystemDictionary::always_strong_oops_do reports the application
       // class loader as a root. We want this root to be reported as

@@ -2973,11 +2973,11 @@
     char type = field->field_type();
     if (!is_primitive_field_type(type)) {
       oop fld_o = o->obj_field(field->field_offset());
       // ignore any objects that aren't visible to profiler
       if (fld_o != NULL && ServiceUtil::visible_oop(fld_o)) {
-        assert(Universe::heap()->is_in_reserved(fld_o), "unsafe code should not "
+        assert(GC::gc()->heap()->is_in_reserved(fld_o), "unsafe code should not "
                "have references to Klass* anymore");
         int slot = field->field_index();
         if (!CallbackInvoker::report_field_reference(o, fld_o, slot)) {
           return false;
         }