src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp

rev 53273 : 8217016: Shenandoah: Streamline generation of CAS barriers

*** 773,787 ****
--- 773,795 ----
  
  #ifdef _LP64
      if (adr->bottom_type()->is_ptr_to_narrowoop()) {
        Node *newval_enc = kit->gvn().transform(new EncodePNode(new_val, new_val->bottom_type()->make_narrowoop()));
        Node *oldval_enc = kit->gvn().transform(new EncodePNode(expected_val, expected_val->bottom_type()->make_narrowoop()));
+       if (ShenandoahCASBarrier) {
          load_store = kit->gvn().transform(new ShenandoahCompareAndExchangeNNode(kit->control(), mem, adr, newval_enc, oldval_enc, adr_type, value_type->make_narrowoop(), mo));
+       } else {
+         load_store = kit->gvn().transform(new CompareAndExchangeNNode(kit->control(), mem, adr, newval_enc, oldval_enc, adr_type, value_type->make_narrowoop(), mo));
+       }
      } else
  #endif
      {
+       if (ShenandoahCASBarrier) {
          load_store = kit->gvn().transform(new ShenandoahCompareAndExchangePNode(kit->control(), mem, adr, new_val, expected_val, adr_type, value_type->is_oopptr(), mo));
+       } else {
+         load_store = kit->gvn().transform(new CompareAndExchangePNode(kit->control(), mem, adr, new_val, expected_val, adr_type, value_type->is_oopptr(), mo));
+       }
      }
  
      access.set_raw_access(load_store);
      pin_atomic_op(access);
  
*** 811,833 ****
--- 819,857 ----
      Node* adr = access.addr().node();
  #ifdef _LP64
      if (adr->bottom_type()->is_ptr_to_narrowoop()) {
        Node *newval_enc = kit->gvn().transform(new EncodePNode(new_val, new_val->bottom_type()->make_narrowoop()));
        Node *oldval_enc = kit->gvn().transform(new EncodePNode(expected_val, expected_val->bottom_type()->make_narrowoop()));
+       if (ShenandoahCASBarrier) {
          if (is_weak_cas) {
            load_store = kit->gvn().transform(new ShenandoahWeakCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
          } else {
            load_store = kit->gvn().transform(new ShenandoahCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
          }
+       } else {
+         if (is_weak_cas) {
+           load_store = kit->gvn().transform(new WeakCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+         } else {
+           load_store = kit->gvn().transform(new CompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+         }
+       }
      } else
  #endif
      {
+       if (ShenandoahCASBarrier) {
          if (is_weak_cas) {
            load_store = kit->gvn().transform(new ShenandoahWeakCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
          } else {
            load_store = kit->gvn().transform(new ShenandoahCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
          }
+       } else {
+         if (is_weak_cas) {
+           load_store = kit->gvn().transform(new WeakCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+         } else {
+           load_store = kit->gvn().transform(new CompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+         }
+       }
      }
      access.set_raw_access(load_store);
      pin_atomic_op(access);
      return load_store;
    }