--- old/src/hotspot/share/compiler/disassembler.cpp	2018-04-12 10:20:24.484119664 +0200
+++ new/src/hotspot/share/compiler/disassembler.cpp	2018-04-12 10:20:24.282110939 +0200
@@ -318,7 +318,7 @@
       return;
     }
 
-    BarrierSet* bs = Universe::heap()->barrier_set();
+    BarrierSet* bs = BarrierSet::barrier_set();
     if (bs->is_a(BarrierSet::CardTableBarrierSet) &&
         adr == ci_card_table_address_as<address>()) {
       st->print("word_map_base");