--- a/hotspot/src/share/vm/opto/graphKit.cpp	Thu Feb 26 21:00:03 2015 +0100
+++ b/hotspot/src/share/vm/opto/graphKit.cpp	Fri Feb 27 19:52:48 2015 -0500
@@ -3759,7 +3759,8 @@
 
 Node* GraphKit::byte_map_base_node() {
   // Get base of card map
-  CardTableModRefBS* ct = (CardTableModRefBS*)(Universe::heap()->barrier_set());
+  CardTableModRefBS* ct =
+    barrier_set_cast<CardTableModRefBS>(Universe::heap()->barrier_set());
   assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust users of this code");
   if (ct->byte_map_base != NULL) {
     return makecon(TypeRawPtr::make((address)ct->byte_map_base));