src/share/vm/opto/loopPredicate.cpp

rev 6807 : 7173584: Implement arraycopy as a macro node
Summary: delay the conversion of arraycopy to stub calls to macro expansion
Reviewed-by:

*** 761,773 ****
        } else if (TraceLoopOpts) {
          tty->print("Predicate IC ");
          loop->dump_head();
        }
  #endif
!     } else if ((cl != NULL) && (proj->_con == predicate_proj->_con) &&
!                loop->is_range_check_if(iff, this, invar)) {
! 
        // Range check for counted loops
        const Node*    cmp    = bol->in(1)->as_Cmp();
        Node*          idx    = cmp->in(1);
        assert(!invar.is_invariant(idx), "index is variant");
        Node* rng = cmp->in(2);
--- 761,771 ----
        } else if (TraceLoopOpts) {
          tty->print("Predicate IC ");
          loop->dump_head();
        }
  #endif
!     } else if (cl != NULL && loop->is_range_check_if(iff, this, invar)) {
        // Range check for counted loops
        const Node*    cmp    = bol->in(1)->as_Cmp();
        Node*          idx    = cmp->in(1);
        assert(!invar.is_invariant(idx), "index is variant");
        Node* rng = cmp->in(2);
*** 798,819 ****
          assert(invar.is_invariant(offset), "offset must be loop invariant");
          offset = invar.clone(offset, ctrl);
        }
  
        // Test the lower bound
!       Node*  lower_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, false);
        IfNode* lower_bound_iff = lower_bound_proj->in(0)->as_If();
        _igvn.hash_delete(lower_bound_iff);
        lower_bound_iff->set_req(1, lower_bound_bol);
!       if (TraceLoopPredicate) tty->print_cr("lower bound check if: %d", lower_bound_iff->_idx);
  
        // Test the upper bound
!       Node* upper_bound_bol = rc_predicate(loop, lower_bound_proj, scale, offset, init, limit, stride, rng, true);
        IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
        _igvn.hash_delete(upper_bound_iff);
        upper_bound_iff->set_req(1, upper_bound_bol);
!       if (TraceLoopPredicate) tty->print_cr("upper bound check if: %d", lower_bound_iff->_idx);
  
        // Fall through into rest of the clean up code which will move
        // any dependent nodes onto the upper bound test.
        new_predicate_proj = upper_bound_proj;
  
--- 796,830 ----
          assert(invar.is_invariant(offset), "offset must be loop invariant");
          offset = invar.clone(offset, ctrl);
        }
  
        // Test the lower bound
!       BoolNode*  lower_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, false);
!       // Negate test if necessary
!       bool negated = false;
!       if (proj->_con != predicate_proj->_con) {
!         lower_bound_bol = new BoolNode(lower_bound_bol->in(1), lower_bound_bol->_test.negate());
!         register_new_node(lower_bound_bol, ctrl);
!         negated = true;
!       }
        IfNode* lower_bound_iff = lower_bound_proj->in(0)->as_If();
        _igvn.hash_delete(lower_bound_iff);
        lower_bound_iff->set_req(1, lower_bound_bol);
!       if (TraceLoopPredicate) tty->print_cr("lower bound check if: %s %d ", negated ? " negated" : "", lower_bound_iff->_idx);
  
        // Test the upper bound
!       BoolNode* upper_bound_bol = rc_predicate(loop, lower_bound_proj, scale, offset, init, limit, stride, rng, true);
!       negated = false;
!       if (proj->_con != predicate_proj->_con) {
!         upper_bound_bol = new BoolNode(upper_bound_bol->in(1), upper_bound_bol->_test.negate());
!         register_new_node(upper_bound_bol, ctrl);
!         negated = true;
!       }
        IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
        _igvn.hash_delete(upper_bound_iff);
        upper_bound_iff->set_req(1, upper_bound_bol);
!       if (TraceLoopPredicate) tty->print_cr("upper bound check if: %s %d ", negated ? " negated" : "", lower_bound_iff->_idx);
  
        // Fall through into rest of the clean up code which will move
        // any dependent nodes onto the upper bound test.
        new_predicate_proj = upper_bound_proj;