--- a/hotspot/src/share/vm/compiler/disassembler.cpp	Thu Feb 26 21:00:03 2015 +0100
+++ b/hotspot/src/share/vm/compiler/disassembler.cpp	Fri Feb 27 19:52:48 2015 -0500
@@ -340,8 +340,8 @@
     }
 
     BarrierSet* bs = Universe::heap()->barrier_set();
-    if (bs->kind() == BarrierSet::CardTableModRef &&
-        adr == (address)((CardTableModRefBS*)(bs))->byte_map_base) {
+    if (bs->is_a(BarrierSet::CardTableModRef) &&
+        adr == (address)(barrier_set_cast<CardTableModRefBS>(bs)->byte_map_base)) {
       st->print("word_map_base");
       if (WizardMode) st->print(" " INTPTR_FORMAT, (intptr_t)adr);
       return;