src/hotspot/share/adlc/formssel.cpp

@@ -788,14 +788,10 @@
         !strcmp(_matrule->_rChild->_opType,"CheckCastPP")  ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetP")   ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetN")   ||
         !strcmp(_matrule->_rChild->_opType,"RotateLeft")   ||
         !strcmp(_matrule->_rChild->_opType,"RotateRight")   ||
- #if INCLUDE_SHENANDOAHGC
-        !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeP") ||
-        !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeN") ||
- #endif
         !strcmp(_matrule->_rChild->_opType,"StrInflatedCopy") ||
         !strcmp(_matrule->_rChild->_opType,"VectorCmpMasked")||
         !strcmp(_matrule->_rChild->_opType,"VectorMaskGen")||
         !strcmp(_matrule->_rChild->_opType,"VerifyVectorAlignment")||
         !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeP") ||

@@ -3651,13 +3647,10 @@
      "LoadVectorGather", "StoreVectorScatter", "LoadVectorGatherMasked", "StoreVectorScatterMasked",
      "LoadRange", "LoadKlass", "LoadNKlass", "LoadL_unaligned", "LoadD_unaligned",
      "CompareAndSwapB", "CompareAndSwapS", "CompareAndSwapI", "CompareAndSwapL", "CompareAndSwapP", "CompareAndSwapN",
      "WeakCompareAndSwapB", "WeakCompareAndSwapS", "WeakCompareAndSwapI", "WeakCompareAndSwapL", "WeakCompareAndSwapP", "WeakCompareAndSwapN",
      "CompareAndExchangeB", "CompareAndExchangeS", "CompareAndExchangeI", "CompareAndExchangeL", "CompareAndExchangeP", "CompareAndExchangeN",
- #if INCLUDE_SHENANDOAHGC
-     "ShenandoahCompareAndSwapN", "ShenandoahCompareAndSwapP", "ShenandoahWeakCompareAndSwapP", "ShenandoahWeakCompareAndSwapN", "ShenandoahCompareAndExchangeP", "ShenandoahCompareAndExchangeN",
- #endif
      "GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP",
      "GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN",
      "ClearArray"
    };
    int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*);