# HG changeset patch
# User rkennke
# Date 1512470603 0
#      Tue Dec 05 10:43:23 2017 +0000
# Node ID 68e166ef8d80024ca1aa472e8574b89ff6b2c7c0
# Parent  c6e7e25780c13de050b41dffdcd480899c5ff5c7
[mq]: aarch64-ctmrbs.patch

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -5892,8 +5892,8 @@
 operand immByteMapBase()
 %{
   // Get base of card map
-  predicate((jbyte*)n->get_ptr() ==
-        ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base);
+  predicate(Universe::heap()->barrier_set()->is_a(BarrierSet::CardTableModRef) &&
+    (jbyte*)n->get_ptr() == ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base);
   match(ConP);
 
   op_cost(0);