--- old/src/hotspot/cpu/aarch64/aarch64.ad	2020-01-17 17:14:14.086117035 +0100
+++ new/src/hotspot/cpu/aarch64/aarch64.ad	2020-01-17 17:14:13.983117041 +0100
@@ -1280,6 +1280,10 @@
     case Op_GetAndSetN:
     case Op_GetAndAddI:
     case Op_GetAndAddL:
+#if INCLUDE_SHENANDOAHGC
+    case Op_ShenandoahCompareAndSwapP:
+    case Op_ShenandoahCompareAndSwapN:
+#endif
       return true;
     case Op_CompareAndExchangeI:
     case Op_CompareAndExchangeN: