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

equal deleted inserted replaced

-:513739bb6c10
+:a9e6034d7707
 cmp_x = phase->transform(cmp_x);
 // Make the bool
 Node *b_c = phase->transform(new BoolNode(cmp_c,b->_test._test));
 Node *b_x = phase->transform(new BoolNode(cmp_x,b->_test._test));
 // Make the IfNode
-IfNode *iff_c = new IfNode(region_c,b_c,iff->_prob,iff->_fcnt);
+IfNode* iff_c = iff->clone()->as_If();
+iff_c->set_req(0, region_c);
+iff_c->set_req(1, b_c);
 igvn->set_type_bottom(iff_c);
 igvn->_worklist.push(iff_c);
 hook->init_req(2, iff_c);
-IfNode *iff_x = new IfNode(region_x,b_x,iff->_prob, iff->_fcnt);
+IfNode* iff_x = iff->clone()->as_If();
+iff_x->set_req(0, region_x);
+iff_x->set_req(1, b_x);
 igvn->set_type_bottom(iff_x);
 igvn->_worklist.push(iff_x);
 hook->init_req(3, iff_x);
 // Make the true/false arms
 //------------------------------is_range_check---------------------------------
 // Return 0 if not a range check.  Return 1 if a range check and set index and
 // offset.  Return 2 if we had to negate the test.  Index is NULL if the check
 // is versus a constant.
-int IfNode::is_range_check(Node* &range, Node* &index, jint &offset) {
+int RangeCheckNode::is_range_check(Node* &range, Node* &index, jint &offset) {
 int flip_test = 0;
 Node* l = NULL;
 Node* r = NULL;
 ProjNode* iftrap = range_check_trap_proj(flip_test, l, r);
 // Is a dominating control suitable for folding with this if?
 bool IfNode::is_ctrl_folds(Node* ctrl, PhaseIterGVN* igvn) {
 return ctrl != NULL &&
 ctrl->is_Proj() &&
 ctrl->in(0) != NULL &&
-ctrl->in(0)->is_If() &&
+ctrl->in(0)->Opcode() == Op_If &&
 ctrl->in(0)->outcnt() == 2 &&
 ctrl->in(0)->as_If()->cmpi_folds(igvn) &&
 // Must compare same value
 ctrl->in(0)->in(1)->in(1)->in(1) != NULL &&
 ctrl->in(0)->in(1)->in(1)->in(1) == in(1)->in(1)->in(1);
 if (type2 != NULL) {
 failtype = failtype->join(type2)->is_int();
 if (failtype->_lo > failtype->_hi) {
 // previous if determines the result of this if so
 // replace Bool with constant
-igvn->hash_delete(this);
+igvn->_worklist.push(in(1));
-set_req(1, igvn->intcon(success->_con));
+igvn->replace_input_of(this, 1, igvn->intcon(success->_con));
 return true;
 }
 }
 }
 lo = NULL;
 }
 Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim));
 Node* newbool = igvn->transform(new BoolNode(newcmp, cond));
 igvn->replace_input_of(dom_iff, 1, igvn->intcon(proj->_con));
-set_req(1, newbool);
+igvn->_worklist.push(in(1));
+igvn->replace_input_of(this, 1, newbool);
 return true;
 }
 return false;
 }
 // Merge the branches that trap for this If and the dominating If into
 // a single region that branches to the uncommon trap for the
 // dominating If
-void IfNode::merge_uncommon_traps(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn) {
+Node* IfNode::merge_uncommon_traps(ProjNode* proj, ProjNode* success, ProjNode* fail, PhaseIterGVN* igvn) {
+Node* res = this;
+assert(success->in(0) == this, "bad projection");
 ProjNode* otherproj = proj->other_if_proj();
 CallStaticJavaNode* unc = success->is_uncommon_trap_proj(Deoptimization::Reason_none);
 CallStaticJavaNode* dom_unc = otherproj->is_uncommon_trap_proj(Deoptimization::Reason_none);
 // Reason_range_check so the compiler recognizes it as a range
 // check and applies the corresponding optimizations
 trap_request = Deoptimization::make_trap_request(Deoptimization::Reason_range_check, action);
 improve_address_types(l, r, fail, igvn);
+res = igvn->transform(new RangeCheckNode(in(0), in(1), _prob, _fcnt));
 } else if (unc != dom_unc) {
 // If we trap we won't know what CmpI would have caused the trap
 // so use a special trap reason to mark this pair of CmpI nodes as
 // bad candidate for folding. On recompilation we won't fold them
 // and we may trap again but this time we'll know what branch
 // traps
 trap_request = Deoptimization::make_trap_request(Deoptimization::Reason_unstable_fused_if, action);
 }
 igvn->replace_input_of(dom_unc, TypeFunc::Parms, igvn->intcon(trap_request));
+return res;
 }
 // If we are turning 2 CmpI nodes into a CmpU that follows the pattern
 // of a rangecheck on index i, on 64 bit the compares may be followed
 // by memory accesses using i as index. In that case, the CmpU tells
 return this;
 }
 if (has_only_uncommon_traps(dom_cmp, success, fail, igvn) &&
 // Next call modifies graph so must be last
 fold_compares_helper(dom_cmp, success, fail, igvn)) {
-merge_uncommon_traps(dom_cmp, success, fail, igvn);
+return merge_uncommon_traps(dom_cmp, success, fail, igvn);
-return this;
 }
 return NULL;
 } else if (ctrl->in(0) != NULL &&
 ctrl->in(0)->in(0) != NULL) {
 ProjNode* success = NULL;
 has_only_uncommon_traps(dom_cmp, success, fail, igvn) &&
 is_side_effect_free_test(other_cmp, igvn) &&
 // Next call modifies graph so must be last
 fold_compares_helper(dom_cmp, success, fail, igvn)) {
 reroute_side_effect_free_unc(other_cmp, dom_cmp, igvn);
-merge_uncommon_traps(dom_cmp, success, fail, igvn);
+return merge_uncommon_traps(dom_cmp, success, fail, igvn);
-return this;
 }
 }
 }
 return NULL;
 }
 struct RangeCheck {
 Node* ctl;
 jint off;
 };
-//------------------------------Ideal------------------------------------------
+Node* IfNode::Ideal_common(PhaseGVN *phase, bool can_reshape) {
-// Return a node which is more "ideal" than the current node.  Strip out
-// control copies
-Node *IfNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 if (remove_dead_region(phase, can_reshape))  return this;
 // No Def-Use info?
 if (!can_reshape)  return NULL;
-PhaseIterGVN *igvn = phase->is_IterGVN();
 // Don't bother trying to transform a dead if
 if (in(0)->is_top())  return NULL;
 // Don't bother trying to transform an if with a dead test
 if (in(1)->is_top())  return NULL;
 // Canonicalize the test.
 Node* idt_if = idealize_test(phase, this);
 if (idt_if != NULL)  return idt_if;
 // Try to split the IF
+PhaseIterGVN *igvn = phase->is_IterGVN();
 Node *s = split_if(this, igvn);
 if (s != NULL)  return s;
+return NodeSentinel;
+}
+//------------------------------Ideal------------------------------------------
+// Return a node which is more "ideal" than the current node.  Strip out
+// control copies
+Node* IfNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+Node* res = Ideal_common(phase, can_reshape);
+if (res != NodeSentinel) {
+return res;
+}
 // Check for people making a useless boolean: things like
 // if( (x < y ? true : false) ) { ... }
 // Replace with if( x < y ) { ... }
 Node *bol2 = remove_useless_bool(this, phase);
 if( bol2 ) return bol2;
+if (in(0) == NULL) return NULL;     // Dead loop?
+PhaseIterGVN *igvn = phase->is_IterGVN();
+Node* result = fold_compares(igvn);
+if (result != NULL) {
+return result;
+}
+// Scan for an equivalent test
+Node *cmp;
+int dist = 0;               // Cutoff limit for search
+int op = Opcode();
+if( op == Op_If &&
+(cmp=in(1)->in(1))->Opcode() == Op_CmpP ) {
+if( cmp->in(2) != NULL && // make sure cmp is not already dead
+cmp->in(2)->bottom_type() == TypePtr::NULL_PTR ) {
+dist = 64;              // Limit for null-pointer scans
+} else {
+dist = 4;               // Do not bother for random pointer tests
+}
+} else {
+dist = 4;                 // Limit for random junky scans
+}
+Node* prev_dom = search_identical(dist);
+if (prev_dom == NULL) {
+return NULL;
+}
+// Replace dominated IfNode
+return dominated_by(prev_dom, igvn);
+}
+//------------------------------dominated_by-----------------------------------
+Node* IfNode::dominated_by(Node* prev_dom, PhaseIterGVN *igvn) {
+#ifndef PRODUCT
+if (TraceIterativeGVN) {
+tty->print("   Removing IfNode: "); this->dump();
+}
+if (VerifyOpto && !igvn->allow_progress()) {
+// Found an equivalent dominating test,
+// we can not guarantee reaching a fix-point for these during iterativeGVN
+// since intervening nodes may not change.
+return NULL;
+}
+#endif
+igvn->hash_delete(this);      // Remove self to prevent spurious V-N
+Node *idom = in(0);
+// Need opcode to decide which way 'this' test goes
+int prev_op = prev_dom->Opcode();
+Node *top = igvn->C->top(); // Shortcut to top
+// Loop predicates may have depending checks which should not
+// be skipped. For example, range check predicate has two checks
+// for lower and upper bounds.
+ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj();
+if (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate) != NULL)
+prev_dom = idom;
+// Now walk the current IfNode's projections.
+// Loop ends when 'this' has no more uses.
+for (DUIterator_Last imin, i = last_outs(imin); i >= imin; --i) {
+Node *ifp = last_out(i);     // Get IfTrue/IfFalse
+igvn->add_users_to_worklist(ifp);
+// Check which projection it is and set target.
+// Data-target is either the dominating projection of the same type
+// or TOP if the dominating projection is of opposite type.
+// Data-target will be used as the new control edge for the non-CFG
+// nodes like Casts and Loads.
+Node *data_target = (ifp->Opcode() == prev_op) ? prev_dom : top;
+// Control-target is just the If's immediate dominator or TOP.
+Node *ctrl_target = (ifp->Opcode() == prev_op) ?     idom : top;
+// For each child of an IfTrue/IfFalse projection, reroute.
+// Loop ends when projection has no more uses.
+for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) {
+Node* s = ifp->last_out(j);   // Get child of IfTrue/IfFalse
+if( !s->depends_only_on_test() ) {
+// Find the control input matching this def-use edge.
+// For Regions it may not be in slot 0.
+uint l;
+for( l = 0; s->in(l) != ifp; l++ ) { }
+igvn->replace_input_of(s, l, ctrl_target);
+} else {                      // Else, for control producers,
+igvn->replace_input_of(s, 0, data_target); // Move child to data-target
+}
+} // End for each child of a projection
+igvn->remove_dead_node(ifp);
+} // End for each IfTrue/IfFalse child of If
+// Kill the IfNode
+igvn->remove_dead_node(this);
+// Must return either the original node (now dead) or a new node
+// (Do not return a top here, since that would break the uniqueness of top.)
+return new ConINode(TypeInt::ZERO);
+}
+Node* IfNode::search_identical(int dist) {
 // Setup to scan up the CFG looking for a dominating test
-Node *dom = in(0);
+Node* dom = in(0);
-Node *prev_dom = this;
+Node* prev_dom = this;
+int op = Opcode();
+// Search up the dominator tree for an If with an identical test
+while( dom->Opcode() != op    ||  // Not same opcode?
+dom->in(1)    != in(1) ||  // Not same input 1?
+(req() == 3 && dom->in(2) != in(2)) || // Not same input 2?
+prev_dom->in(0) != dom ) { // One path of test does not dominate?
+if( dist < 0 ) return NULL;
+dist--;
+prev_dom = dom;
+dom = up_one_dom( dom );
+if( !dom ) return NULL;
+}
+// Check that we did not follow a loop back to ourselves
+if( this == dom )
+return NULL;
+if( dist > 2 )              // Add to count of NULL checks elided
+explicit_null_checks_elided++;
+return prev_dom;
+}
+//------------------------------Identity---------------------------------------
+// If the test is constant & we match, then we are the input Control
+Node *IfProjNode::Identity(PhaseTransform *phase) {
+// Can only optimize if cannot go the other way
+const TypeTuple *t = phase->type(in(0))->is_tuple();
+if (t == TypeTuple::IFNEITHER ||
+// kill dead branch first otherwise the IfNode's control will
+// have 2 control uses (the IfNode that doesn't go away because
+// it still has uses and this branch of the
+// If). Node::has_special_unique_user() will cause this node to
+// be reprocessed once the dead branch is killed.
+(always_taken(t) && in(0)->outcnt() == 1)) {
+// IfNode control
+return in(0)->in(0);
+}
+// no progress
+return this;
+}
+#ifndef PRODUCT
+//-------------------------------related---------------------------------------
+// An IfProjNode's related node set consists of its input (an IfNode) including
+// the IfNode's condition, plus all of its outputs at level 1. In compact mode,
+// the restrictions for IfNode apply (see IfNode::rel).
+void IfProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+Node* ifNode = this->in(0);
+in_rel->append(ifNode);
+if (compact) {
+ifNode->collect_nodes(in_rel, 3, false, true);
+} else {
+ifNode->collect_nodes_in_all_data(in_rel, false);
+}
+this->collect_nodes(out_rel, -1, false, false);
+}
+//------------------------------dump_spec--------------------------------------
+void IfNode::dump_spec(outputStream *st) const {
+st->print("P=%f, C=%f",_prob,_fcnt);
+}
+//-------------------------------related---------------------------------------
+// For an IfNode, the set of related output nodes is just the output nodes till
+// depth 2, i.e, the IfTrue/IfFalse projection nodes plus the nodes they refer.
+// The related input nodes contain no control nodes, but all data nodes
+// pertaining to the condition. In compact mode, the input nodes are collected
+// up to a depth of 3.
+void IfNode::related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const {
+if (compact) {
+this->collect_nodes(in_rel, 3, false, true);
+} else {
+this->collect_nodes_in_all_data(in_rel, false);
+}
+this->collect_nodes(out_rel, -2, false, false);
+}
+#endif
+//------------------------------idealize_test----------------------------------
+// Try to canonicalize tests better.  Peek at the Cmp/Bool/If sequence and
+// come up with a canonical sequence.  Bools getting 'eq', 'gt' and 'ge' forms
+// converted to 'ne', 'le' and 'lt' forms.  IfTrue/IfFalse get swapped as
+// needed.
+static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff) {
+assert(iff->in(0) != NULL, "If must be live");
+if (iff->outcnt() != 2)  return NULL; // Malformed projections.
+Node* old_if_f = iff->proj_out(false);
+Node* old_if_t = iff->proj_out(true);
+// CountedLoopEnds want the back-control test to be TRUE, irregardless of
+// whether they are testing a 'gt' or 'lt' condition.  The 'gt' condition
+// happens in count-down loops
+if (iff->is_CountedLoopEnd())  return NULL;
+if (!iff->in(1)->is_Bool())  return NULL; // Happens for partially optimized IF tests
+BoolNode *b = iff->in(1)->as_Bool();
+BoolTest bt = b->_test;
+// Test already in good order?
+if( bt.is_canonical() )
+return NULL;
+// Flip test to be canonical.  Requires flipping the IfFalse/IfTrue and
+// cloning the IfNode.
+Node* new_b = phase->transform( new BoolNode(b->in(1), bt.negate()) );
+if( !new_b->is_Bool() ) return NULL;
+b = new_b->as_Bool();
+PhaseIterGVN *igvn = phase->is_IterGVN();
+assert( igvn, "Test is not canonical in parser?" );
+// The IF node never really changes, but it needs to be cloned
+iff = iff->clone()->as_If();
+iff->set_req(1, b);
+iff->_prob = 1.0-iff->_prob;
+Node *prior = igvn->hash_find_insert(iff);
+if( prior ) {
+igvn->remove_dead_node(iff);
+iff = (IfNode*)prior;
+} else {
+// Cannot call transform on it just yet
+igvn->set_type_bottom(iff);
+}
+igvn->_worklist.push(iff);
+// Now handle projections.  Cloning not required.
+Node* new_if_f = (Node*)(new IfFalseNode( iff ));
+Node* new_if_t = (Node*)(new IfTrueNode ( iff ));
+igvn->register_new_node_with_optimizer(new_if_f);
+igvn->register_new_node_with_optimizer(new_if_t);
+// Flip test, so flip trailing control
+igvn->replace_node(old_if_f, new_if_t);
+igvn->replace_node(old_if_t, new_if_f);
+// Progress
+return iff;
+}
+Node* RangeCheckNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+Node* res = Ideal_common(phase, can_reshape);
+if (res != NodeSentinel) {
+return res;
+}
+PhaseIterGVN *igvn = phase->is_IterGVN();
+// Setup to scan up the CFG looking for a dominating test
+Node* prev_dom = this;
 // Check for range-check vs other kinds of tests
-Node *index1, *range1;
+Node* index1;
+Node* range1;
 jint offset1;
 int flip1 = is_range_check(range1, index1, offset1);
-if( flip1 ) {
+if (flip1) {
+Node* dom = in(0);
 // Try to remove extra range checks.  All 'up_one_dom' gives up at merges
 // so all checks we inspect post-dominate the top-most check we find.
 // If we are going to fail the current check and we reach the top check
 // then we are guaranteed to fail, so just start interpreting there.
 // We 'expand' the top 3 range checks to include all post-dominating
 bool found_immediate_dominator = false;
 // Scan for the top checks and collect range of offsets
 for (int dist = 0; dist < 999; dist++) { // Range-Check scan limit
-if (dom->Opcode() == Op_If &&  // Not same opcode?
+if (dom->Opcode() == Op_RangeCheck &&  // Not same opcode?
 prev_dom->in(0) == dom) { // One path of test does dominate?
 if (dom == this) return NULL; // dead loop
 // See if this is a range check
-Node *index2, *range2;
+Node* index2;
+Node* range2;
 jint offset2;
-int flip2 = dom->as_If()->is_range_check(range2, index2, offset2);
+int flip2 = dom->as_RangeCheck()->is_range_check(range2, index2, offset2);
 // See if this is a _matching_ range check, checking against
 // the same array bounds.
 if (flip2 == flip1 && range2 == range1 && index2 == index1 &&
 dom->outcnt() == 2) {
 if (nb_checks == 0 && dom->in(1) == in(1)) {
 adjust_check(rc0.ctl, range1, index1, flip1, off_hi, igvn);
 // Test is now covered by prior checks, dominate it out
 prev_dom = rc0.ctl;
 }
 }
+} else {
-} else {                      // Scan for an equivalent test
+prev_dom = search_identical(4);
-Node *cmp;
+if (prev_dom == NULL) {
-int dist = 0;               // Cutoff limit for search
-int op = Opcode();
-if( op == Op_If &&
-(cmp=in(1)->in(1))->Opcode() == Op_CmpP ) {
-if( cmp->in(2) != NULL && // make sure cmp is not already dead
-cmp->in(2)->bottom_type() == TypePtr::NULL_PTR ) {
-dist = 64;              // Limit for null-pointer scans
-} else {
-dist = 4;               // Do not bother for random pointer tests
-}
-} else {
-dist = 4;                 // Limit for random junky scans
-}
-// Normal equivalent-test check.
-if( !dom ) return NULL;     // Dead loop?
-Node* result = fold_compares(igvn);
-if (result != NULL) {
-return result;
-}
-// Search up the dominator tree for an If with an identical test
-while( dom->Opcode() != op    ||  // Not same opcode?
-dom->in(1)    != in(1) ||  // Not same input 1?
-(req() == 3 && dom->in(2) != in(2)) || // Not same input 2?
-prev_dom->in(0) != dom ) { // One path of test does not dominate?
-if( dist < 0 ) return NULL;
-dist--;
-prev_dom = dom;
-dom = up_one_dom( dom );
-if( !dom ) return NULL;
-}
-// Check that we did not follow a loop back to ourselves
-if( this == dom )
 return NULL;
+}
-if( dist > 2 )              // Add to count of NULL checks elided
+}
-explicit_null_checks_elided++;
-} // End of Else scan for an equivalent test
-// Hit!  Remove this IF
-#ifndef PRODUCT
-if( TraceIterativeGVN ) {
-tty->print("   Removing IfNode: "); this->dump();
-}
-if( VerifyOpto && !phase->allow_progress() ) {
-// Found an equivalent dominating test,
-// we can not guarantee reaching a fix-point for these during iterativeGVN
-// since intervening nodes may not change.
-return NULL;
-}
-#endif
 // Replace dominated IfNode
-dominated_by( prev_dom, igvn );
+return dominated_by(prev_dom, igvn);
+}
-// Must return either the original node (now dead) or a new node
-// (Do not return a top here, since that would break the uniqueness of top.)
-return new ConINode(TypeInt::ZERO);
-}
-//------------------------------dominated_by-----------------------------------
-void IfNode::dominated_by( Node *prev_dom, PhaseIterGVN *igvn ) {
-igvn->hash_delete(this);      // Remove self to prevent spurious V-N
-Node *idom = in(0);
-// Need opcode to decide which way 'this' test goes
-int prev_op = prev_dom->Opcode();
-Node *top = igvn->C->top(); // Shortcut to top
-// Loop predicates may have depending checks which should not
-// be skipped. For example, range check predicate has two checks
-// for lower and upper bounds.
-ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj();
-if (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate) != NULL)
-prev_dom = idom;
-// Now walk the current IfNode's projections.
-// Loop ends when 'this' has no more uses.
-for (DUIterator_Last imin, i = last_outs(imin); i >= imin; --i) {
-Node *ifp = last_out(i);     // Get IfTrue/IfFalse
-igvn->add_users_to_worklist(ifp);
-// Check which projection it is and set target.
-// Data-target is either the dominating projection of the same type
-// or TOP if the dominating projection is of opposite type.
-// Data-target will be used as the new control edge for the non-CFG
-// nodes like Casts and Loads.
-Node *data_target = (ifp->Opcode() == prev_op) ? prev_dom : top;
-// Control-target is just the If's immediate dominator or TOP.
-Node *ctrl_target = (ifp->Opcode() == prev_op) ?     idom : top;
-// For each child of an IfTrue/IfFalse projection, reroute.
-// Loop ends when projection has no more uses.
-for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) {
-Node* s = ifp->last_out(j);   // Get child of IfTrue/IfFalse
-if( !s->depends_only_on_test() ) {
-// Find the control input matching this def-use edge.
-// For Regions it may not be in slot 0.
-uint l;
-for( l = 0; s->in(l) != ifp; l++ ) { }
-igvn->replace_input_of(s, l, ctrl_target);
-} else {                      // Else, for control producers,
-igvn->replace_input_of(s, 0, data_target); // Move child to data-target
-}
-} // End for each child of a projection
-igvn->remove_dead_node(ifp);
-} // End for each IfTrue/IfFalse child of If
-// Kill the IfNode
-igvn->remove_dead_node(this);
-}
-//------------------------------Identity---------------------------------------
-// If the test is constant & we match, then we are the input Control
-Node *IfProjNode::Identity(PhaseTransform *phase) {
-// Can only optimize if cannot go the other way
-const TypeTuple *t = phase->type(in(0))->is_tuple();
-if (t == TypeTuple::IFNEITHER ||
-// kill dead branch first otherwise the IfNode's control will
-// have 2 control uses (the IfNode that doesn't go away because
-// it still has uses and this branch of the
-// If). Node::has_special_unique_user() will cause this node to
-// be reprocessed once the dead branch is killed.
-(always_taken(t) && in(0)->outcnt() == 1)) {
-// IfNode control
-return in(0)->in(0);
-}
-// no progress
-return this;
-}
-#ifndef PRODUCT
-//-------------------------------related---------------------------------------
-// An IfProjNode's related node set consists of its input (an IfNode) including
-// the IfNode's condition, plus all of its outputs at level 1. In compact mode,
-// the restrictions for IfNode apply (see IfNode::rel).
-void IfProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
-Node* ifNode = this->in(0);
-in_rel->append(ifNode);
-if (compact) {
-ifNode->collect_nodes(in_rel, 3, false, true);
-} else {
-ifNode->collect_nodes_in_all_data(in_rel, false);
-}
-this->collect_nodes(out_rel, -1, false, false);
-}
-//------------------------------dump_spec--------------------------------------
-void IfNode::dump_spec(outputStream *st) const {
-st->print("P=%f, C=%f",_prob,_fcnt);
-}
-//-------------------------------related---------------------------------------
-// For an IfNode, the set of related output nodes is just the output nodes till
-// depth 2, i.e, the IfTrue/IfFalse projection nodes plus the nodes they refer.
-// The related input nodes contain no control nodes, but all data nodes
-// pertaining to the condition. In compact mode, the input nodes are collected
-// up to a depth of 3.
-void IfNode::related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const {
-if (compact) {
-this->collect_nodes(in_rel, 3, false, true);
-} else {
-this->collect_nodes_in_all_data(in_rel, false);
-}
-this->collect_nodes(out_rel, -2, false, false);
-}
-#endif
-//------------------------------idealize_test----------------------------------
-// Try to canonicalize tests better.  Peek at the Cmp/Bool/If sequence and
-// come up with a canonical sequence.  Bools getting 'eq', 'gt' and 'ge' forms
-// converted to 'ne', 'le' and 'lt' forms.  IfTrue/IfFalse get swapped as
-// needed.
-static IfNode* idealize_test(PhaseGVN* phase, IfNode* iff) {
-assert(iff->in(0) != NULL, "If must be live");
-if (iff->outcnt() != 2)  return NULL; // Malformed projections.
-Node* old_if_f = iff->proj_out(false);
-Node* old_if_t = iff->proj_out(true);
-// CountedLoopEnds want the back-control test to be TRUE, irregardless of
-// whether they are testing a 'gt' or 'lt' condition.  The 'gt' condition
-// happens in count-down loops
-if (iff->is_CountedLoopEnd())  return NULL;
-if (!iff->in(1)->is_Bool())  return NULL; // Happens for partially optimized IF tests
-BoolNode *b = iff->in(1)->as_Bool();
-BoolTest bt = b->_test;
-// Test already in good order?
-if( bt.is_canonical() )
-return NULL;
-// Flip test to be canonical.  Requires flipping the IfFalse/IfTrue and
-// cloning the IfNode.
-Node* new_b = phase->transform( new BoolNode(b->in(1), bt.negate()) );
-if( !new_b->is_Bool() ) return NULL;
-b = new_b->as_Bool();
-PhaseIterGVN *igvn = phase->is_IterGVN();
-assert( igvn, "Test is not canonical in parser?" );
-// The IF node never really changes, but it needs to be cloned
-iff = new IfNode( iff->in(0), b, 1.0-iff->_prob, iff->_fcnt);
-Node *prior = igvn->hash_find_insert(iff);
-if( prior ) {
-igvn->remove_dead_node(iff);
-iff = (IfNode*)prior;
-} else {
-// Cannot call transform on it just yet
-igvn->set_type_bottom(iff);
-}
-igvn->_worklist.push(iff);
-// Now handle projections.  Cloning not required.
-Node* new_if_f = (Node*)(new IfFalseNode( iff ));
-Node* new_if_t = (Node*)(new IfTrueNode ( iff ));
-igvn->register_new_node_with_optimizer(new_if_f);
-igvn->register_new_node_with_optimizer(new_if_t);
-// Flip test, so flip trailing control
-igvn->replace_node(old_if_f, new_if_t);
-igvn->replace_node(old_if_t, new_if_f);
-// Progress
-return iff;
-}

changeset 34164	a9e6034d7707
parent 34151	8e0bebdbc29e
child 34180	f0ec91019db2
child 34177	e19e45b065c6