jdk8-mips64-public/hotspot: comparison src/share/vm/runtime/deoptimization.cpp

-:5fcfaa1ad96f
+:87684f1a88b5
 // recompile relies on a methodDataOop to record heroic opt failures.
 // Whether the interpreter is producing MDO data or not, we also need
 // to use the MDO to detect hot deoptimization points and control
 // aggressive optimization.
+bool inc_recompile_count = false;
+ProfileData* pdata = NULL;
 if (ProfileTraps && update_trap_state && trap_mdo.not_null()) {
 assert(trap_mdo() == get_method_data(thread, trap_method, false), "sanity");
 uint this_trap_count = 0;
 bool maybe_prior_trap = false;
 bool maybe_prior_recompile = false;
-ProfileData* pdata
+pdata = query_update_method_data(trap_mdo, trap_bci, reason,
-= query_update_method_data(trap_mdo, trap_bci, reason,
 //outputs:
 this_trap_count,
 maybe_prior_trap,
 maybe_prior_recompile);
 // Because the interpreter also counts null, div0, range, and class
 }
 // Detect repeated recompilation at the same BCI, and enforce a limit.
 if (make_not_entrant && maybe_prior_recompile) {
 // More than one recompile at this point.
-trap_mdo->inc_overflow_recompile_count();
+inc_recompile_count = maybe_prior_trap;
-if (maybe_prior_trap
-&& ((uint)trap_mdo->overflow_recompile_count()
-> (uint)PerBytecodeRecompilationCutoff)) {
-// Give up on the method containing the bad BCI.
-if (trap_method() == nm->method()) {
-make_not_compilable = true;
-} else {
-trap_method->set_not_compilable();
-// But give grace to the enclosing nm->method().
-}
-}
 }
 } else {
 // For reasons which are not recorded per-bytecode, we simply
 // force recompiles unconditionally.
 // (Note that PerMethodRecompilationCutoff is enforced elsewhere.)
 // for a while to exercise it more thoroughly.
 if (make_not_entrant && maybe_prior_recompile && maybe_prior_trap) {
 reset_counters = true;
 }
-if (make_not_entrant && pdata != NULL) {
+}
+// Take requested actions on the method:
+// Recompile
+if (make_not_entrant) {
+if (!nm->make_not_entrant()) {
+return; // the call did not change nmethod's state
+}
+if (pdata != NULL) {
 // Record the recompilation event, if any.
 int tstate0 = pdata->trap_state();
 int tstate1 = trap_state_set_recompiled(tstate0, true);
 if (tstate1 != tstate0)
 pdata->set_trap_state(tstate1);
 }
 }
-// Take requested actions on the method:
+if (inc_recompile_count) {
+trap_mdo->inc_overflow_recompile_count();
+if ((uint)trap_mdo->overflow_recompile_count() >
+(uint)PerBytecodeRecompilationCutoff) {
+// Give up on the method containing the bad BCI.
+if (trap_method() == nm->method()) {
+make_not_compilable = true;
+} else {
+trap_method->set_not_compilable();
+// But give grace to the enclosing nm->method().
+}
+}
+}
 // Reset invocation counters
 if (reset_counters) {
 if (nm->is_osr_method())
 reset_invocation_counter(trap_scope, CompileThreshold);
 else
 reset_invocation_counter(trap_scope);
 }
-// Recompile
-if (make_not_entrant) {
-nm->make_not_entrant();
-}
 // Give up compiling
-if (make_not_compilable) {
+if (make_not_compilable && !nm->method()->is_not_compilable()) {
 assert(make_not_entrant, "consistent");
 nm->method()->set_not_compilable();
 }
 } // Free marked resources
 tstate1 = trap_state_add_reason(tstate1, per_bc_reason);
 // Store the updated state on the MDO, for next time.
 if (tstate1 != tstate0)
 pdata->set_trap_state(tstate1);
 } else {
-if (LogCompilation && xtty != NULL)
+if (LogCompilation && xtty != NULL) {
+ttyLocker ttyl;
 // Missing MDP?  Leave a small complaint in the log.
 xtty->elem("missing_mdp bci='%d'", trap_bci);
+}
 }
 }
 // Return results:
 ret_this_trap_count = this_trap_count;
 "null_assert",
 "range_check",
 "class_check",
 "array_check",
 "intrinsic",
+"bimorphic",
 "unloaded",
 "uninitialized",
 "unreached",
 "unhandled",
 "constraint",

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/runtime/deoptimization.cpp

src/share/vm/runtime/deoptimization.cpp