1.1 --- a/src/share/vm/opto/compile.cpp Sat Apr 02 09:49:27 2011 -0700
1.2 +++ b/src/share/vm/opto/compile.cpp Sat Apr 02 10:54:15 2011 -0700
1.3 @@ -1632,7 +1632,6 @@
1.4 igvn.replace_node(n, n->in(1));
1.5 }
1.6 assert(predicate_count()==0, "should be clean!");
1.7 - igvn.optimize();
1.8 }
1.9
1.10 //------------------------------Optimize---------------------------------------
1.11 @@ -1689,7 +1688,7 @@
1.12 if((loop_opts_cnt > 0) && (has_loops() || has_split_ifs())) {
1.13 {
1.14 TracePhase t2("idealLoop", &_t_idealLoop, true);
1.15 - PhaseIdealLoop ideal_loop( igvn, true, UseLoopPredicate);
1.16 + PhaseIdealLoop ideal_loop( igvn, true );
1.17 loop_opts_cnt--;
1.18 if (major_progress()) print_method("PhaseIdealLoop 1", 2);
1.19 if (failing()) return;
1.20 @@ -1697,7 +1696,7 @@
1.21 // Loop opts pass if partial peeling occurred in previous pass
1.22 if(PartialPeelLoop && major_progress() && (loop_opts_cnt > 0)) {
1.23 TracePhase t3("idealLoop", &_t_idealLoop, true);
1.24 - PhaseIdealLoop ideal_loop( igvn, false, UseLoopPredicate);
1.25 + PhaseIdealLoop ideal_loop( igvn, false );
1.26 loop_opts_cnt--;
1.27 if (major_progress()) print_method("PhaseIdealLoop 2", 2);
1.28 if (failing()) return;
1.29 @@ -1705,7 +1704,7 @@
1.30 // Loop opts pass for loop-unrolling before CCP
1.31 if(major_progress() && (loop_opts_cnt > 0)) {
1.32 TracePhase t4("idealLoop", &_t_idealLoop, true);
1.33 - PhaseIdealLoop ideal_loop( igvn, false, UseLoopPredicate);
1.34 + PhaseIdealLoop ideal_loop( igvn, false );
1.35 loop_opts_cnt--;
1.36 if (major_progress()) print_method("PhaseIdealLoop 3", 2);
1.37 }
1.38 @@ -1743,21 +1742,13 @@
1.39 // peeling, unrolling, etc.
1.40 if(loop_opts_cnt > 0) {
1.41 debug_only( int cnt = 0; );
1.42 - bool loop_predication = UseLoopPredicate;
1.43 while(major_progress() && (loop_opts_cnt > 0)) {
1.44 TracePhase t2("idealLoop", &_t_idealLoop, true);
1.45 assert( cnt++ < 40, "infinite cycle in loop optimization" );
1.46 - PhaseIdealLoop ideal_loop( igvn, true, loop_predication);
1.47 + PhaseIdealLoop ideal_loop( igvn, true);
1.48 loop_opts_cnt--;
1.49 if (major_progress()) print_method("PhaseIdealLoop iterations", 2);
1.50 if (failing()) return;
1.51 - // Perform loop predication optimization during first iteration after CCP.
1.52 - // After that switch it off and cleanup unused loop predicates.
1.53 - if (loop_predication) {
1.54 - loop_predication = false;
1.55 - cleanup_loop_predicates(igvn);
1.56 - if (failing()) return;
1.57 - }
1.58 }
1.59 }
1.60
