diff -r 46f2dc7c4c39 -r ee93c1087584 src/hotspot/share/ci/ciUtilities.cpp
--- a/src/hotspot/share/ci/ciUtilities.cpp	Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/ci/ciUtilities.cpp	Thu Apr 12 11:22:24 2018 +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");