src/hotspot/share/adlc/formssel.cpp

rev 54995 : 8224675: Late GC barrier insertion for ZGC
Reviewed-by:

*** 755,765 ****
    }
  
    return NO_MEMORY_OPERAND;
  }
  
- 
  // This instruction captures the machine-independent bottom_type
  // Expected use is for pointer vs oop determination for LoadP
  bool InstructForm::captures_bottom_type(FormDict &globals) const {
    if (_matrule && _matrule->_rChild &&
        (!strcmp(_matrule->_rChild->_opType,"CastPP")       ||  // new result type
--- 755,764 ----
*** 773,784 ****
         !strcmp(_matrule->_rChild->_opType,"CreateEx")     ||  // type of exception
         !strcmp(_matrule->_rChild->_opType,"CheckCastPP")  ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetP")   ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetN")   ||
  #if INCLUDE_ZGC
         !strcmp(_matrule->_rChild->_opType,"LoadBarrierSlowReg") ||
-        !strcmp(_matrule->_rChild->_opType,"LoadBarrierWeakSlowReg") ||
  #endif
  #if INCLUDE_SHENANDOAHGC
         !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeP") ||
         !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeN") ||
  #endif
--- 772,784 ----
         !strcmp(_matrule->_rChild->_opType,"CreateEx")     ||  // type of exception
         !strcmp(_matrule->_rChild->_opType,"CheckCastPP")  ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetP")   ||
         !strcmp(_matrule->_rChild->_opType,"GetAndSetN")   ||
  #if INCLUDE_ZGC
+        !strcmp(_matrule->_rChild->_opType,"ZGetAndSetP") ||
+        !strcmp(_matrule->_rChild->_opType,"ZCompareAndExchangeP") ||
         !strcmp(_matrule->_rChild->_opType,"LoadBarrierSlowReg") ||
  #endif
  #if INCLUDE_SHENANDOAHGC
         !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeP") ||
         !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeN") ||
  #endif
*** 3504,3519 ****
      "LoadPLocked",
      "StorePConditional", "StoreIConditional", "StoreLConditional",
      "CompareAndSwapB", "CompareAndSwapS", "CompareAndSwapI", "CompareAndSwapL", "CompareAndSwapP", "CompareAndSwapN",
      "WeakCompareAndSwapB", "WeakCompareAndSwapS", "WeakCompareAndSwapI", "WeakCompareAndSwapL", "WeakCompareAndSwapP", "WeakCompareAndSwapN",
      "CompareAndExchangeB", "CompareAndExchangeS", "CompareAndExchangeI", "CompareAndExchangeL", "CompareAndExchangeP", "CompareAndExchangeN",
      "ShenandoahCompareAndSwapN", "ShenandoahCompareAndSwapP", "ShenandoahWeakCompareAndSwapP", "ShenandoahWeakCompareAndSwapN", "ShenandoahCompareAndExchangeP", "ShenandoahCompareAndExchangeN",
      "StoreCM",
-     "ClearArray",
      "GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP",
      "GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN",
!     "LoadBarrierSlowReg", "LoadBarrierWeakSlowReg"
    };
    int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*);
    if( strcmp(_opType,"PrefetchAllocation")==0 )
      return 1;
    if( _lChild ) {
--- 3504,3523 ----
      "LoadPLocked",
      "StorePConditional", "StoreIConditional", "StoreLConditional",
      "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
      "StoreCM",
      "GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP",
      "GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN",
! #if INCLUDE_ZGC
!     "LoadBarrierSlowReg", "ZGetAndSetP", "ZCompareAndSwapP", "ZCompareAndExchangeP", "ZWeakCompareAndSwapP",
! #endif
!     "ClearArray"
    };
    int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*);
    if( strcmp(_opType,"PrefetchAllocation")==0 )
      return 1;
    if( _lChild ) {