1.1 --- a/src/share/vm/opto/parse2.cpp Mon Mar 21 02:30:49 2011 -0700
1.2 +++ b/src/share/vm/opto/parse2.cpp Mon Mar 21 11:28:14 2011 -0700
1.3 @@ -293,11 +293,6 @@
1.4 if (len < 1) {
1.5 // If this is a backward branch, add safepoint
1.6 maybe_add_safepoint(default_dest);
1.7 - if (should_add_predicate(default_dest)){
1.8 - _sp += 1; // set original stack for use by uncommon_trap
1.9 - add_predicate();
1.10 - _sp -= 1;
1.11 - }
1.12 merge(default_dest);
1.13 return;
1.14 }
1.15 @@ -344,11 +339,6 @@
1.16
1.17 if (len < 1) { // If this is a backward branch, add safepoint
1.18 maybe_add_safepoint(default_dest);
1.19 - if (should_add_predicate(default_dest)){
1.20 - _sp += 1; // set original stack for use by uncommon_trap
1.21 - add_predicate();
1.22 - _sp -= 1;
1.23 - }
1.24 merge(default_dest);
1.25 return;
1.26 }
1.27 @@ -756,9 +746,6 @@
1.28 push(_gvn.makecon(ret_addr));
1.29
1.30 // Flow to the jsr.
1.31 - if (should_add_predicate(jsr_bci)){
1.32 - add_predicate();
1.33 - }
1.34 merge(jsr_bci);
1.35 }
1.36
1.37 @@ -1040,11 +1027,6 @@
1.38 profile_taken_branch(target_bci);
1.39 adjust_map_after_if(btest, c, prob, branch_block, next_block);
1.40 if (!stopped()) {
1.41 - if (should_add_predicate(target_bci)){ // add a predicate if it branches to a loop
1.42 - int nargs = repush_if_args(); // set original stack for uncommon_trap
1.43 - add_predicate();
1.44 - _sp -= nargs;
1.45 - }
1.46 merge(target_bci);
1.47 }
1.48 }
1.49 @@ -1168,11 +1150,6 @@
1.50 profile_taken_branch(target_bci);
1.51 adjust_map_after_if(taken_btest, c, prob, branch_block, next_block);
1.52 if (!stopped()) {
1.53 - if (should_add_predicate(target_bci)){ // add a predicate if it branches to a loop
1.54 - int nargs = repush_if_args(); // set original stack for the uncommon_trap
1.55 - add_predicate();
1.56 - _sp -= nargs;
1.57 - }
1.58 merge(target_bci);
1.59 }
1.60 }
1.61 @@ -2166,10 +2143,6 @@
1.62 // Update method data
1.63 profile_taken_branch(target_bci);
1.64
1.65 - // Add loop predicate if it goes to a loop
1.66 - if (should_add_predicate(target_bci)){
1.67 - add_predicate();
1.68 - }
1.69 // Merge the current control into the target basic block
1.70 merge(target_bci);
1.71
