graal-jvmci-8: src/share/vm/opto/loopTransform.cpp comparison

comparison src/share/vm/opto/loopTransform.cpp @ 401:ee8f06bfb27c

6743188: incomplete fix for 6700047 C2 failed in idom_no_update Reviewed-by: rasbold, kvn

author	never
date	Fri, 03 Oct 2008 13:58:20 -0700
parents	cc80376deb0c
children	a1980da045cc

comparison

equal deleted inserted replaced

-:cc80376deb0c
+:ee8f06bfb27c
 }
 //=============================================================================
 //------------------------------iteration_split_impl---------------------------
-void IdealLoopTree::iteration_split_impl( PhaseIdealLoop *phase, Node_List &old_new ) {
+bool IdealLoopTree::iteration_split_impl( PhaseIdealLoop *phase, Node_List &old_new ) {
 // Check and remove empty loops (spam micro-benchmarks)
 if( policy_do_remove_empty_loop(phase) )
-return;                     // Here we removed an empty loop
+return true;                     // Here we removed an empty loop
 bool should_peel = policy_peeling(phase); // Should we peel?
 bool should_unswitch = policy_unswitching(phase);
 // Non-counted loops may be peeled; exactly 1 iteration is peeled.
 // This removes loop-invariant tests (usually null checks).
 if( !_head->is_CountedLoop() ) { // Non-counted loop
 if (PartialPeelLoop && phase->partial_peel(this, old_new)) {
-return;
+// Partial peel succeeded so terminate this round of loop opts
+return false;
 }
 if( should_peel ) {            // Should we peel?
 #ifndef PRODUCT
 if (PrintOpto) tty->print_cr("should_peel");
 #endif
 phase->do_peeling(this,old_new);
 } else if( should_unswitch ) {
 phase->do_unswitching(this, old_new);
 }
-return;
+return true;
 }
 CountedLoopNode *cl = _head->as_CountedLoop();
-if( !cl->loopexit() ) return; // Ignore various kinds of broken loops
+if( !cl->loopexit() ) return true; // Ignore various kinds of broken loops
 // Do nothing special to pre- and post- loops
-if( cl->is_pre_loop() || cl->is_post_loop() ) return;
+if( cl->is_pre_loop() || cl->is_post_loop() ) return true;
 // Compute loop trip count from profile data
 compute_profile_trip_cnt(phase);
 // Before attempting fancy unrolling, RCE or alignment, see if we want
 bool should_maximally_unroll =  policy_maximally_unroll(phase);
 if( should_maximally_unroll ) {
 // Here we did some unrolling and peeling.  Eventually we will
 // completely unroll this loop and it will no longer be a loop.
 phase->do_maximally_unroll(this,old_new);
-return;
+return true;
 }
 if (should_unswitch) {
 phase->do_unswitching(this, old_new);
-return;
+return true;
 }
 }
 // Counted loops may be peeled, may need some iterations run up
 } else {                      // Else we have an unchanged counted loop
 if( should_peel )           // Might want to peel but do nothing else
 phase->do_peeling(this,old_new);
 }
+return true;
 }
 //=============================================================================
 //------------------------------iteration_split--------------------------------
-void IdealLoopTree::iteration_split( PhaseIdealLoop *phase, Node_List &old_new ) {
+bool IdealLoopTree::iteration_split( PhaseIdealLoop *phase, Node_List &old_new ) {
 // Recursively iteration split nested loops
-if( _child ) _child->iteration_split( phase, old_new );
+if( _child && !_child->iteration_split( phase, old_new ))
+return false;
 // Clean out prior deadwood
 DCE_loop_body();
 if( !_child &&                // If not an inner loop, do not split
 !_irreducible &&
 _allow_optimizations &&
 !tail()->is_top() ) {     // Also ignore the occasional dead backedge
 if (!_has_call) {
-iteration_split_impl( phase, old_new );
+if (!iteration_split_impl( phase, old_new )) {
+return false;
+}
 } else if (policy_unswitching(phase)) {
 phase->do_unswitching(this, old_new);
 }
 }
 // Minor offset re-organization to remove loop-fallout uses of
 // trip counter.
 if( _head->is_CountedLoop() ) phase->reorg_offsets( this );
-if( _next ) _next->iteration_split( phase, old_new );
+if( _next && !_next->iteration_split( phase, old_new ))
-}
+return false;
+return true;
+}

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/opto/loopTransform.cpp @ 401:ee8f06bfb27c