src/share/vm/code/relocInfo_ext.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -34,33 +34,33 @@
 #ifdef COMPILER1
 #include "c1/c1_globals.hpp"
 #endif
 
 address symbolic_Relocation::symbolic_value(symbolic_Relocation::symbolic_reference t) {
-  if (Universe::heap() == NULL) {
+  if (GC::is_initialized()) {
     // the symbolic values are not needed so early
     // (and most of them lead to errors if asked too early)
     return NULL;
   }
   switch(t) {
   case symbolic_Relocation::polling_page_reference: {
     return os::get_polling_page();
   }
   case symbolic_Relocation::eden_top_reference: {
-    if (!Universe::heap()->supports_inline_contig_alloc()) {
+    if (! GC::gc()->heap()->supports_inline_contig_alloc()) {
       return NULL;
     }
-    return (address)Universe::heap()->top_addr();
+    return (address) GC::gc()->heap()->top_addr();
   }
   case symbolic_Relocation::heap_end_reference: {
-    if (!Universe::heap()->supports_inline_contig_alloc()) {
+    if (! GC::gc()->heap()->supports_inline_contig_alloc()) {
       return NULL;
     }
-    return (address)Universe::heap()->end_addr();
+    return (address)GC::gc()->heap()->end_addr();
   }
   case symbolic_Relocation::card_table_reference: {
-    BarrierSet* bs = Universe::heap()->barrier_set();
+    BarrierSet* bs = GC::gc()->heap()->barrier_set();
     CardTableModRefBS* ct = (CardTableModRefBS*)bs;
     return (address)ct->byte_map_base;
   }
   case symbolic_Relocation::mark_bits_reference: {
     return (address)Universe::verify_mark_bits();