jdk-sandbox: comparison hotspot/src/share/vm/opto/memnode.cpp

equal deleted inserted replaced

-:96be33305a55
+:a44a1e70a3e4
 result = optimize_simple_memory_chain(result, t_adr, phase);
 if (is_instance && igvn != NULL  && result->is_Phi()) {
 PhiNode *mphi = result->as_Phi();
 assert(mphi->bottom_type() == Type::MEMORY, "memory phi required");
 const TypePtr *t = mphi->adr_type();
-if (t == TypePtr::BOTTOM || t == TypeRawPtr::BOTTOM) {
+if (t == TypePtr::BOTTOM || t == TypeRawPtr::BOTTOM ||
+t->isa_oopptr() && !t->is_oopptr()->is_instance() &&
+t->is_oopptr()->cast_to_instance(t_oop->instance_id()) == t_oop) {
 // clone the Phi with our address type
 result = mphi->split_out_instance(t_adr, igvn);
 } else {
 assert(phase->C->get_alias_index(t) == phase->C->get_alias_index(t_adr), "correct memory chain");
 }
 // 'dom' dominates 'sub' if its control edge and control edges
 // of all its inputs dominate or equal to sub's control edge.
 // Currently 'sub' is either Allocate, Initialize or Start nodes.
-assert(sub->is_Allocate() || sub->is_Initialize() || sub->is_Start(), "expecting only these nodes");
+// Or Region for the check in LoadNode::Ideal();
+// 'sub' should have sub->in(0) != NULL.
+assert(sub->is_Allocate() || sub->is_Initialize() || sub->is_Start() ||
+sub->is_Region(), "expecting only these nodes");
 // Get control edge of 'sub'.
 sub = sub->find_exact_control(sub->in(0));
 if (sub == NULL || sub->is_top())
 return false; // Conservative answer for dead code
 //------------------------------Ideal_DU_postCCP-------------------------------
 // Find any cast-away of null-ness and keep its control.  Null cast-aways are
 // going away in this pass and we need to make this memory op depend on the
 // gating null check.
+Node *MemNode::Ideal_DU_postCCP( PhaseCCP *ccp ) {
+return Ideal_common_DU_postCCP(ccp, this, in(MemNode::Address));
+}
 // I tried to leave the CastPP's in.  This makes the graph more accurate in
 // some sense; we get to keep around the knowledge that an oop is not-null
 // after some test.  Alas, the CastPP's interfere with GVN (some values are
 // the regular oop, some are the CastPP of the oop, all merge at Phi's which
 // cannot collapse, etc).  This cost us 10% on SpecJVM, even when I removed
 // some of the more trivial cases in the optimizer.  Removing more useless
 // Phi's started allowing Loads to illegally float above null checks.  I gave
 // up on this approach.  CNC 10/20/2000
-Node *MemNode::Ideal_DU_postCCP( PhaseCCP *ccp ) {
+// This static method may be called not from MemNode (EncodePNode calls it).
-Node *ctr = in(MemNode::Control);
+// Only the control edge of the node 'n' might be updated.
-Node *mem = in(MemNode::Memory);
+Node *MemNode::Ideal_common_DU_postCCP( PhaseCCP *ccp, Node* n, Node* adr ) {
-Node *adr = in(MemNode::Address);
 Node *skipped_cast = NULL;
 // Need a null check?  Regular static accesses do not because they are
 // from constant addresses.  Array ops are gated by the range check (which
 // always includes a NULL check).  Just check field ops.
-if( !ctr ) {
+if( n->in(MemNode::Control) == NULL ) {
 // Scan upwards for the highest location we can place this memory op.
 while( true ) {
 switch( adr->Opcode() ) {
 case Op_AddP:             // No change to NULL-ness, so peek thru AddP's
 adr = adr->in(1);
 continue;
 }
 // CastPP is going away in this pass!  We need this memory op to be
 // control-dependent on the test that is guarding the CastPP.
-ccp->hash_delete(this);
+ccp->hash_delete(n);
-set_req(MemNode::Control, adr->in(0));
+n->set_req(MemNode::Control, adr->in(0));
-ccp->hash_insert(this);
+ccp->hash_insert(n);
-return this;
+return n;
 case Op_Phi:
 // Attempt to float above a Phi to some dominating point.
 if (adr->in(0) != NULL && adr->in(0)->is_CountedLoop()) {
 // If we've already peeked through a Cast (which could have set the
 // the node in place. 4959717.
 skipped_cast = adr;
 adr = adr->in(1);
 continue;
 }
-ccp->hash_delete(this);
+ccp->hash_delete(n);
-set_req(MemNode::Control, adr->in(0));
+n->set_req(MemNode::Control, adr->in(0));
-ccp->hash_insert(this);
+ccp->hash_insert(n);
-return this;
+return n;
 // List of "safe" opcodes; those that implicitly block the memory
 // op below any null check.
 case Op_CastX2P:          // no null checks on native pointers
 case Op_Parm:             // 'this' pointer is not null
 case Op_LoadP:            // Loading from within a klass
 case Op_LoadN:            // Loading from within a klass
 case Op_LoadKlass:        // Loading from within a klass
 case Op_ConP:             // Loading from a klass
+case Op_ConN:             // Loading from a klass
 case Op_CreateEx:         // Sucking up the guts of an exception oop
 case Op_Con:              // Reading from TLS
 case Op_CMoveP:           // CMoveP is pinned
 break;                  // No progress
 case Op_SCMemProj:        // Memory state from store conditional ops
 #ifdef ASSERT
 {
 assert(adr->as_Proj()->_con == TypeFunc::Parms, "must be return value");
 const Node* call = adr->in(0);
-if (call->is_CallStaticJava()) {
+if (call->is_CallJava()) {
-const CallStaticJavaNode* call_java = call->as_CallStaticJava();
+const CallJavaNode* call_java = call->as_CallJava();
 const TypeTuple *r = call_java->tf()->range();
 assert(r->cnt() > TypeFunc::Parms, "must return value");
 const Type* ret_type = r->field_at(TypeFunc::Parms);
 assert(ret_type && ret_type->isa_ptr(), "must return pointer");
 // We further presume that this is one of
 case T_FLOAT:   return new (C, 3) LoadFNode(ctl, mem, adr, adr_type, rt              );
 case T_DOUBLE:  return new (C, 3) LoadDNode(ctl, mem, adr, adr_type, rt              );
 case T_ADDRESS: return new (C, 3) LoadPNode(ctl, mem, adr, adr_type, rt->is_ptr()    );
 case T_OBJECT:
 #ifdef _LP64
-if (adr->bottom_type()->is_narrow()) {
+if (adr->bottom_type()->is_ptr_to_narrowoop()) {
 const TypeNarrowOop* narrowtype;
 if (rt->isa_narrowoop()) {
 narrowtype = rt->is_narrowoop();
 } else {
 narrowtype = rt->is_oopptr()->make_narrowoop();
 Node* load  = gvn.transform(new (C, 3) LoadNNode(ctl, mem, adr, adr_type, narrowtype));
 return DecodeNNode::decode(&gvn, load);
 } else
 #endif
 {
-assert(!adr->bottom_type()->is_narrow(), "should have got back a narrow oop");
+assert(!adr->bottom_type()->is_ptr_to_narrowoop(), "should have got back a narrow oop");
 return new (C, 3) LoadPNode(ctl, mem, adr, adr_type, rt->is_oopptr());
 }
 }
 ShouldNotReachHere();
 return (LoadNode*)NULL;
 }
 }
 }
 return NULL;
 }
+//------------------------------split_through_phi------------------------------
+// Split instance field load through Phi.
+Node *LoadNode::split_through_phi(PhaseGVN *phase) {
+Node* mem     = in(MemNode::Memory);
+Node* address = in(MemNode::Address);
+const TypePtr *addr_t = phase->type(address)->isa_ptr();
+const TypeOopPtr *t_oop = addr_t->isa_oopptr();
+assert(mem->is_Phi() && (t_oop != NULL) &&
+t_oop->is_instance_field(), "invalide conditions");
+Node *region = mem->in(0);
+if (region == NULL) {
+return NULL; // Wait stable graph
+}
+uint cnt = mem->req();
+for( uint i = 1; i < cnt; i++ ) {
+Node *in = mem->in(i);
+if( in == NULL ) {
+return NULL; // Wait stable graph
+}
+}
+// Check for loop invariant.
+if (cnt == 3) {
+for( uint i = 1; i < cnt; i++ ) {
+Node *in = mem->in(i);
+Node* m = MemNode::optimize_memory_chain(in, addr_t, phase);
+if (m == mem) {
+set_req(MemNode::Memory, mem->in(cnt - i)); // Skip this phi.
+return this;
+}
+}
+}
+// Split through Phi (see original code in loopopts.cpp).
+assert(phase->C->have_alias_type(addr_t), "instance should have alias type");
+// Do nothing here if Identity will find a value
+// (to avoid infinite chain of value phis generation).
+if ( !phase->eqv(this, this->Identity(phase)) )
+return NULL;
+// Skip the split if the region dominates some control edge of the address.
+if (cnt == 3 && !MemNode::all_controls_dominate(address, region))
+return NULL;
+const Type* this_type = this->bottom_type();
+int this_index  = phase->C->get_alias_index(addr_t);
+int this_offset = addr_t->offset();
+int this_iid    = addr_t->is_oopptr()->instance_id();
+int wins = 0;
+PhaseIterGVN *igvn = phase->is_IterGVN();
+Node *phi = new (igvn->C, region->req()) PhiNode(region, this_type, NULL, this_iid, this_index, this_offset);
+for( uint i = 1; i < region->req(); i++ ) {
+Node *x;
+Node* the_clone = NULL;
+if( region->in(i) == phase->C->top() ) {
+x = phase->C->top();      // Dead path?  Use a dead data op
+} else {
+x = this->clone();        // Else clone up the data op
+the_clone = x;            // Remember for possible deletion.
+// Alter data node to use pre-phi inputs
+if( this->in(0) == region ) {
+x->set_req( 0, region->in(i) );
+} else {
+x->set_req( 0, NULL );
+}
+for( uint j = 1; j < this->req(); j++ ) {
+Node *in = this->in(j);
+if( in->is_Phi() && in->in(0) == region )
+x->set_req( j, in->in(i) ); // Use pre-Phi input for the clone
+}
+}
+// Check for a 'win' on some paths
+const Type *t = x->Value(igvn);
+bool singleton = t->singleton();
+// See comments in PhaseIdealLoop::split_thru_phi().
+if( singleton && t == Type::TOP ) {
+singleton &= region->is_Loop() && (i != LoopNode::EntryControl);
+}
+if( singleton ) {
+wins++;
+x = igvn->makecon(t);
+} else {
+// We now call Identity to try to simplify the cloned node.
+// Note that some Identity methods call phase->type(this).
+// Make sure that the type array is big enough for
+// our new node, even though we may throw the node away.
+// (This tweaking with igvn only works because x is a new node.)
+igvn->set_type(x, t);
+Node *y = x->Identity(igvn);
+if( y != x ) {
+wins++;
+x = y;
+} else {
+y = igvn->hash_find(x);
+if( y ) {
+wins++;
+x = y;
+} else {
+// Else x is a new node we are keeping
+// We do not need register_new_node_with_optimizer
+// because set_type has already been called.
+igvn->_worklist.push(x);
+}
+}
+}
+if (x != the_clone && the_clone != NULL)
+igvn->remove_dead_node(the_clone);
+phi->set_req(i, x);
+}
+if( wins > 0 ) {
+// Record Phi
+igvn->register_new_node_with_optimizer(phi);
+return phi;
+}
+igvn->remove_dead_node(phi);
+return NULL;
+}
 //------------------------------Ideal------------------------------------------
 // If the load is from Field memory and the pointer is non-null, we can
 // zero out the control input.
 // If the offset is constant and the base is an object allocation,
 return this;
 }
 const TypeOopPtr *t_oop = addr_t->isa_oopptr();
 if (can_reshape && opt_mem->is_Phi() &&
 (t_oop != NULL) && t_oop->is_instance_field()) {
-assert(t_oop->offset() != Type::OffsetBot && t_oop->offset() != Type::OffsetTop, "");
+// Split instance field load through Phi.
-Node *region = opt_mem->in(0);
+Node* result = split_through_phi(phase);
-uint cnt = opt_mem->req();
+if (result != NULL) return result;
-for( uint i = 1; i < cnt; i++ ) {
-Node *in = opt_mem->in(i);
-if( in == NULL ) {
-region = NULL; // Wait stable graph
-break;
-}
-}
-if (region != NULL) {
-// Check for loop invariant.
-if (cnt == 3) {
-for( uint i = 1; i < cnt; i++ ) {
-Node *in = opt_mem->in(i);
-Node* m = MemNode::optimize_memory_chain(in, addr_t, phase);
-if (m == opt_mem) {
-set_req(MemNode::Memory, opt_mem->in(cnt - i)); // Skip this phi.
-return this;
-}
-}
-}
-// Split through Phi (see original code in loopopts.cpp).
-assert(phase->C->have_alias_type(addr_t), "instance should have alias type");
-// Do nothing here if Identity will find a value
-// (to avoid infinite chain of value phis generation).
-if ( !phase->eqv(this, this->Identity(phase)) )
-return NULL;
-const Type* this_type = this->bottom_type();
-int this_index  = phase->C->get_alias_index(addr_t);
-int this_offset = addr_t->offset();
-int this_iid    = addr_t->is_oopptr()->instance_id();
-int wins = 0;
-PhaseIterGVN *igvn = phase->is_IterGVN();
-Node *phi = new (igvn->C, region->req()) PhiNode(region, this_type, NULL, this_iid, this_index, this_offset);
-for( uint i = 1; i < region->req(); i++ ) {
-Node *x;
-Node* the_clone = NULL;
-if( region->in(i) == phase->C->top() ) {
-x = phase->C->top();      // Dead path?  Use a dead data op
-} else {
-x = this->clone();        // Else clone up the data op
-the_clone = x;            // Remember for possible deletion.
-// Alter data node to use pre-phi inputs
-if( this->in(0) == region ) {
-x->set_req( 0, region->in(i) );
-} else {
-x->set_req( 0, NULL );
-}
-for( uint j = 1; j < this->req(); j++ ) {
-Node *in = this->in(j);
-if( in->is_Phi() && in->in(0) == region )
-x->set_req( j, in->in(i) ); // Use pre-Phi input for the clone
-}
-}
-// Check for a 'win' on some paths
-const Type *t = x->Value(igvn);
-bool singleton = t->singleton();
-// See comments in PhaseIdealLoop::split_thru_phi().
-if( singleton && t == Type::TOP ) {
-singleton &= region->is_Loop() && (i != LoopNode::EntryControl);
-}
-if( singleton ) {
-wins++;
-x = igvn->makecon(t);
-} else {
-// We now call Identity to try to simplify the cloned node.
-// Note that some Identity methods call phase->type(this).
-// Make sure that the type array is big enough for
-// our new node, even though we may throw the node away.
-// (This tweaking with igvn only works because x is a new node.)
-igvn->set_type(x, t);
-Node *y = x->Identity(igvn);
-if( y != x ) {
-wins++;
-x = y;
-} else {
-y = igvn->hash_find(x);
-if( y ) {
-wins++;
-x = y;
-} else {
-// Else x is a new node we are keeping
-// We do not need register_new_node_with_optimizer
-// because set_type has already been called.
-igvn->_worklist.push(x);
-}
-}
-}
-if (x != the_clone && the_clone != NULL)
-igvn->remove_dead_node(the_clone);
-phi->set_req(i, x);
-}
-if( wins > 0 ) {
-// Record Phi
-igvn->register_new_node_with_optimizer(phi);
-return phi;
-} else {
-igvn->remove_dead_node(phi);
-}
-}
 }
 }
 // Check for prior store with a different base or offset; make Load
 // independent.  Skip through any number of them.  Bail out if the stores
 case T_FLOAT:   return new (C, 4) StoreFNode(ctl, mem, adr, adr_type, val);
 case T_DOUBLE:  return new (C, 4) StoreDNode(ctl, mem, adr, adr_type, val);
 case T_ADDRESS:
 case T_OBJECT:
 #ifdef _LP64
-if (adr->bottom_type()->is_narrow() ||
+if (adr->bottom_type()->is_ptr_to_narrowoop() ||
 (UseCompressedOops && val->bottom_type()->isa_klassptr() &&
 adr->bottom_type()->isa_rawptr())) {
 const TypePtr* type = val->bottom_type()->is_ptr();
 Node* cp = EncodePNode::encode(&gvn, val);
 return new (C, 4) StoreNNode(ctl, mem, adr, adr_type, cp);

changeset 589	a44a1e70a3e4
parent 581	02338c8a1bcf
child 590	2954744d7bba