--- old/src/hotspot/share/ci/ciUtilities.cpp	2018-04-12 10:20:23.859092669 +0200
+++ new/src/hotspot/share/ci/ciUtilities.cpp	2018-04-12 10:20:23.658083988 +0200
@@ -51,7 +51,7 @@
 // ------------------------------------------------------------------
 // card_table_base
 jbyte *ci_card_table_address() {
-  BarrierSet* bs = Universe::heap()->barrier_set();
+  BarrierSet* bs = BarrierSet::barrier_set();
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
   CardTable* ct = ctbs->card_table();
   assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust users of this code");