src/hotspot/share/code/relocInfo_ext.cpp

@@ -57,11 +57,11 @@
       return NULL;
     }
     return (address)Universe::heap()->end_addr();
   }
   case symbolic_Relocation::card_table_reference: {
-    BarrierSet* bs = Universe::heap()->barrier_set();
+    BarrierSet* bs = BarrierSet::barrier_set();
     CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
     CardTable* ct = ctbs->card_table();
     return (address)ct->byte_map_base();
   }
   case symbolic_Relocation::mark_bits_reference: {