@@ -316,11 +316,11 @@ } st->print("Stub::<unknown> " PTR_FORMAT, p2i(adr)); 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"); if (WizardMode) st->print(" " INTPTR_FORMAT, p2i(adr)); return;