1.1 --- a/src/share/vm/opto/macro.cpp Fri Oct 21 20:34:04 2016 +0300
1.2 +++ b/src/share/vm/opto/macro.cpp Fri Oct 28 22:36:23 2016 +0000
1.3 @@ -401,7 +401,7 @@
1.4 for (DUIterator_Fast kmax, k = region->fast_outs(kmax); k < kmax; k++) {
1.5 Node* phi = region->fast_out(k);
1.6 if (phi->is_Phi() && phi != mem &&
1.7 - phi->as_Phi()->is_same_inst_field(phi_type, instance_id, alias_idx, offset)) {
1.8 + phi->as_Phi()->is_same_inst_field(phi_type, (int)mem->_idx, instance_id, alias_idx, offset)) {
1.9 return phi;
1.10 }
1.11 }
1.12 @@ -420,7 +420,7 @@
1.13 GrowableArray <Node *> values(length, length, NULL, false);
1.14
1.15 // create a new Phi for the value
1.16 - PhiNode *phi = new (C) PhiNode(mem->in(0), phi_type, NULL, instance_id, alias_idx, offset);
1.17 + PhiNode *phi = new (C) PhiNode(mem->in(0), phi_type, NULL, mem->_idx, instance_id, alias_idx, offset);
1.18 transform_later(phi);
1.19 value_phis->push(phi, mem->_idx);
1.20
