--- a/src/hotspot/share/code/relocInfo_ext.cpp	Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/code/relocInfo_ext.cpp	Thu Apr 12 11:22:24 2018 +0200
@@ -59,7 +59,7 @@
     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();