src/hotspot/share/opto/loopopts.cpp

*** 1022,1031 ****
--- 1022,1036 ----
      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;
*** 1308,1317 ****
--- 1313,1323 ----
          }
          // If n is a load, and the late control is the same as the current
          // control, then the cloning of n is a pointless exercise, because
          // GVN will ensure that we end up where we started.
          if (!n->is_Load() || late_load_ctrl != n_ctrl) {
+           BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
            for (DUIterator_Last jmin, j = n->last_outs(jmin); j >= jmin; ) {
              Node *u = n->last_out(j); // Clone private computation per use
              _igvn.rehash_node_delayed(u);
              Node *x = n->clone(); // Clone computation
              Node *x_ctrl = NULL;
*** 1338,1347 ****
--- 1344,1357 ----
  
              // Find control for 'x' next to use but not inside inner loops.
              // For inner loop uses get the preheader area.
              x_ctrl = place_near_use(x_ctrl);
  
+             if (bs->sink_node(this, n, x, x_ctrl, n_ctrl)) {
+               continue;
+             }
+ 
              if (n->is_Load()) {
                // For loads, add a control edge to a CFG node outside of the loop
                // to force them to not combine and return back inside the loop
                // during GVN optimization (4641526).
                //
*** 3135,3145 ****
  
          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);
--- 3145,3155 ----
  
          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);