< prev index next >

src/hotspot/share/runtime/deoptimization.cpp

Print this page
rev 56251 : imported patch 8226705-v1
rev 56253 : [mq]: 8226705-v3-pat

*** 296,305 **** --- 296,306 ---- // Reallocate the non-escaping objects and restore their fields. Then // relock objects if synchronization on them was eliminated. if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateAllocations)) { realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk); } + #endif // COMPILER2_OR_JVMCI // Revoke biases, done with in java state. // No safepoints allowed after this revoke_from_deopt_handler(thread, deoptee, &map);
*** 307,316 **** --- 308,318 ---- // in fields of rematerialized objects. If a safepoint occurs from here on // out the java state residing in the vframeArray will be missed. // Locks may be rebaised in a safepoint. NoSafepointVerifier no_safepoint; + #if COMPILER2_OR_JVMCI if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks)) { eliminate_locks(thread, chunk, realloc_failures); } #endif // COMPILER2_OR_JVMCI
*** 1471,1481 **** get_monitors_from_stack(objects_to_revoke, thread, fr, map); int len = objects_to_revoke->length(); for (int i = 0; i < len; i++) { oop obj = (objects_to_revoke->at(i))(); ! BiasedLocking::revoke_own_locks(objects_to_revoke->at(i), thread); assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now"); } } --- 1473,1483 ---- get_monitors_from_stack(objects_to_revoke, thread, fr, map); int len = objects_to_revoke->length(); for (int i = 0; i < len; i++) { oop obj = (objects_to_revoke->at(i))(); ! BiasedLocking::revoke_own_lock(objects_to_revoke->at(i), thread); assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now"); } }
< prev index next >