src/hotspot/share/opto/memnode.cpp

*** 922,933 ****
      LoadNode* ld = clone()->as_Load();
      Node* addp = in(MemNode::Address)->clone();
      if (ac->as_ArrayCopy()->is_clonebasic()) {
        assert(ld_alloc != NULL, "need an alloc");
        assert(addp->is_AddP(), "address must be addp");
!       assert(addp->in(AddPNode::Base) == ac->in(ArrayCopyNode::Dest)->in(AddPNode::Base), "strange pattern");
!       assert(addp->in(AddPNode::Address) == ac->in(ArrayCopyNode::Dest)->in(AddPNode::Address), "strange pattern");
        addp->set_req(AddPNode::Base, src->in(AddPNode::Base));
        addp->set_req(AddPNode::Address, src->in(AddPNode::Address));
      } else {
        assert(ac->as_ArrayCopy()->is_arraycopy_validated() ||
               ac->as_ArrayCopy()->is_copyof_validated() ||
--- 922,935 ----
      LoadNode* ld = clone()->as_Load();
      Node* addp = in(MemNode::Address)->clone();
      if (ac->as_ArrayCopy()->is_clonebasic()) {
        assert(ld_alloc != NULL, "need an alloc");
        assert(addp->is_AddP(), "address must be addp");
!       assert(ac->in(ArrayCopyNode::Dest)->is_AddP(), "dest must be an address");
!       BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!       assert(bs->step_over_gc_barrier(addp->in(AddPNode::Base)) == bs->step_over_gc_barrier(ac->in(ArrayCopyNode::Dest)->in(AddPNode::Base)), "strange pattern");
!       assert(bs->step_over_gc_barrier(addp->in(AddPNode::Address)) == bs->step_over_gc_barrier(ac->in(ArrayCopyNode::Dest)->in(AddPNode::Address)), "strange pattern");
        addp->set_req(AddPNode::Base, src->in(AddPNode::Base));
        addp->set_req(AddPNode::Address, src->in(AddPNode::Address));
      } else {
        assert(ac->as_ArrayCopy()->is_arraycopy_validated() ||
               ac->as_ArrayCopy()->is_copyof_validated() ||
*** 1079,1088 ****
--- 1081,1092 ----
      // Load boxed value from result of valueOf() call is input parameter.
      if (this->is_Load() && ld_adr->is_AddP() &&
          (tp != NULL) && tp->is_ptr_to_boxed_value()) {
        intptr_t ignore = 0;
        Node* base = AddPNode::Ideal_base_and_offset(ld_adr, phase, ignore);
+       BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
+       base = bs->step_over_gc_barrier(base);
        if (base != NULL && base->is_Proj() &&
            base->as_Proj()->_con == TypeFunc::Parms &&
            base->in(0)->is_CallStaticJava() &&
            base->in(0)->as_CallStaticJava()->is_boxing_method()) {
          return base->in(0)->in(TypeFunc::Parms);