src/hotspot/share/opto/macro.cpp

*** 432,442 ****
          return NULL;  // can't find a value on this path
        }
        if (val == mem) {
          values.at_put(j, mem);
        } else if (val->is_Store()) {
!         values.at_put(j, val->in(MemNode::ValueIn));
        } else if(val->is_Proj() && val->in(0) == alloc) {
          values.at_put(j, _igvn.zerocon(ft));
        } else if (val->is_Phi()) {
          val = value_from_mem_phi(val, ft, phi_type, adr_t, alloc, value_phis, level-1);
          if (val == NULL) {
--- 432,445 ----
          return NULL;  // can't find a value on this path
        }
        if (val == mem) {
          values.at_put(j, mem);
        } else if (val->is_Store()) {
!         Node* n = val->in(MemNode::ValueIn);
!         BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!         n = bs->step_over_gc_barrier(n);
!         values.at_put(j, n);
        } else if(val->is_Proj() && val->in(0) == alloc) {
          values.at_put(j, _igvn.zerocon(ft));
        } else if (val->is_Phi()) {
          val = value_from_mem_phi(val, ft, phi_type, adr_t, alloc, value_phis, level-1);
          if (val == NULL) {
*** 544,554 ****
    if (mem != NULL) {
      if (mem == start_mem || mem == alloc_mem) {
        // hit a sentinel, return appropriate 0 value
        return _igvn.zerocon(ft);
      } else if (mem->is_Store()) {
!       return mem->in(MemNode::ValueIn);
      } else if (mem->is_Phi()) {
        // attempt to produce a Phi reflecting the values on the input paths of the Phi
        Node_Stack value_phis(a, 8);
        Node * phi = value_from_mem_phi(mem, ft, ftype, adr_t, alloc, &value_phis, ValueSearchLimit);
        if (phi != NULL) {
--- 547,560 ----
    if (mem != NULL) {
      if (mem == start_mem || mem == alloc_mem) {
        // hit a sentinel, return appropriate 0 value
        return _igvn.zerocon(ft);
      } else if (mem->is_Store()) {
!       Node* n = mem->in(MemNode::ValueIn);
!       BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!       n = bs->step_over_gc_barrier(n);
!       return n;
      } else if (mem->is_Phi()) {
        // attempt to produce a Phi reflecting the values on the input paths of the Phi
        Node_Stack value_phis(a, 8);
        Node * phi = value_from_mem_phi(mem, ft, ftype, adr_t, alloc, &value_phis, ValueSearchLimit);
        if (phi != NULL) {