src/share/vm/opto/macro.cpp

rev 11777 : [mq]: gcinterface.patch

@@ -1235,11 +1235,11 @@
     int tlab_top_offset = in_bytes(JavaThread::tlab_top_offset());
     int tlab_end_offset = in_bytes(JavaThread::tlab_end_offset());
     eden_top_adr = basic_plus_adr(top()/*not oop*/, thread, tlab_top_offset);
     eden_end_adr = basic_plus_adr(top()/*not oop*/, thread, tlab_end_offset);
   } else {                      // Shared allocation: load from globals
-    CollectedHeap* ch = Universe::heap();
+    CollectedHeap* ch = GC::gc()->heap();
     address top_adr = (address)ch->top_addr();
     address end_adr = (address)ch->end_addr();
     eden_top_adr = makecon(TypeRawPtr::make(top_adr));
     eden_end_adr = basic_plus_adr(eden_top_adr, end_adr - top_adr);
   }

@@ -1350,11 +1350,11 @@
   } else {
     initial_slow_test = BoolNode::make_predicate(initial_slow_test, &_igvn);
   }
 
   if (C->env()->dtrace_alloc_probes() ||
-      !UseTLAB && (!Universe::heap()->supports_inline_contig_alloc())) {
+      !UseTLAB && (!GC::gc()->heap()->supports_inline_contig_alloc())) {
     // Force slow-path allocation
     always_slow = true;
     initial_slow_test = NULL;
   }