1.1 --- a/src/share/vm/opto/compile.cpp Tue Apr 28 00:37:33 2015 -0700
1.2 +++ b/src/share/vm/opto/compile.cpp Thu Jan 29 10:25:59 2015 -0800
1.3 @@ -3075,6 +3075,7 @@
1.4 default:
1.5 assert( !n->is_Call(), "" );
1.6 assert( !n->is_Mem(), "" );
1.7 + assert( nop != Op_ProfileBoolean, "should be eliminated during IGVN");
1.8 break;
1.9 }
1.10
1.11 @@ -3291,6 +3292,9 @@
1.12 bool Compile::too_many_traps(ciMethod* method,
1.13 int bci,
1.14 Deoptimization::DeoptReason reason) {
1.15 + if (method->has_injected_profile()) {
1.16 + return false;
1.17 + }
1.18 ciMethodData* md = method->method_data();
1.19 if (md->is_empty()) {
1.20 // Assume the trap has not occurred, or that it occurred only
1.21 @@ -3340,6 +3344,9 @@
1.22 bool Compile::too_many_recompiles(ciMethod* method,
1.23 int bci,
1.24 Deoptimization::DeoptReason reason) {
1.25 + if (method->has_injected_profile()) {
1.26 + return false;
1.27 + }
1.28 ciMethodData* md = method->method_data();
1.29 if (md->is_empty()) {
1.30 // Assume the trap has not occurred, or that it occurred only
