src/hotspot/share/opto/loopopts.cpp

rev 54386 : 8221766: Load-reference barriers for Shenandoah

*** 1080,1094 ****
      if (n->is_Phi()) {
        for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++) {
          Node* m = n->fast_out(j);
          if (m->is_FastLock())
            return false;
- #if INCLUDE_SHENANDOAHGC
-         if (m->is_ShenandoahBarrier() && m->has_out_with(Op_FastLock)) {
-           return false;
-         }
- #endif
  #ifdef _LP64
          if (m->Opcode() == Op_ConvI2L)
            return false;
          if (m->is_CastII() && m->isa_CastII()->has_range_check()) {
            return false;
--- 1080,1089 ----
*** 3208,3218 ****
  
          if ( !has_use_internal_to_set(n, peel, loop) ) {
  
            // if not pinned and not a load (which maybe anti-dependent on a store)
            // and not a CMove (Matcher expects only bool->cmove).
!           if (n->in(0) == NULL && !n->is_Load() && !n->is_CMove() && n->Opcode() != Op_ShenandoahWBMemProj) {
              cloned_for_outside_use += clone_for_use_outside_loop( loop, n, worklist );
              sink_list.push(n);
              peel     >>= n->_idx; // delete n from peel set.
              not_peel <<= n->_idx; // add n to not_peel set.
              peel_list.remove(i);
--- 3203,3213 ----
  
          if ( !has_use_internal_to_set(n, peel, loop) ) {
  
            // if not pinned and not a load (which maybe anti-dependent on a store)
            // and not a CMove (Matcher expects only bool->cmove).
!           if (n->in(0) == NULL && !n->is_Load() && !n->is_CMove()) {
              cloned_for_outside_use += clone_for_use_outside_loop( loop, n, worklist );
              sink_list.push(n);
              peel     >>= n->_idx; // delete n from peel set.
              not_peel <<= n->_idx; // add n to not_peel set.
              peel_list.remove(i);