jdk-sandbox: comparison src/hotspot/share/runtime/deoptimization.cpp

equal deleted inserted replaced

-:4eebb9aadbe3
+:408c445d04e8
 thread->inc_in_deopt_handler();
 return fetch_unroll_info_helper(thread, exec_mode);
 JRT_END
+#if COMPILER2_OR_JVMCI
+static bool eliminate_allocations(JavaThread* thread, int exec_mode, CompiledMethod* compiled_method,
+frame& deoptee, RegisterMap& map, GrowableArray<compiledVFrame*>* chunk) {
+bool realloc_failures = false;
+assert (chunk->at(0)->scope() != NULL,"expect only compiled java frames");
+GrowableArray<ScopeValue*>* objects = chunk->at(0)->scope()->objects();
+// The flag return_oop() indicates call sites which return oop
+// in compiled code. Such sites include java method calls,
+// runtime calls (for example, used to allocate new objects/arrays
+// on slow code path) and any other calls generated in compiled code.
+// It is not guaranteed that we can get such information here only
+// by analyzing bytecode in deoptimized frames. This is why this flag
+// is set during method compilation (see Compile::Process_OopMap_Node()).
+// If the previous frame was popped or if we are dispatching an exception,
+// we don't have an oop result.
+bool save_oop_result = chunk->at(0)->scope()->return_oop() && !thread->popframe_forcing_deopt_reexecution() && (exec_mode == Deoptimization::Unpack_deopt);
+Handle return_value;
+if (save_oop_result) {
+// Reallocation may trigger GC. If deoptimization happened on return from
+// call which returns oop we need to save it since it is not in oopmap.
+oop result = deoptee.saved_oop_result(&map);
+assert(oopDesc::is_oop_or_null(result), "must be oop");
+return_value = Handle(thread, result);
+assert(Universe::heap()->is_in_or_null(result), "must be heap pointer");
+if (TraceDeoptimization) {
+ttyLocker ttyl;
+tty->print_cr("SAVED OOP RESULT " INTPTR_FORMAT " in thread " INTPTR_FORMAT, p2i(result), p2i(thread));
+}
+}
+if (objects != NULL) {
+JRT_BLOCK
+realloc_failures = Deoptimization::realloc_objects(thread, &deoptee, &map, objects, THREAD);
+JRT_END
+bool skip_internal = (compiled_method != NULL) && !compiled_method->is_compiled_by_jvmci();
+Deoptimization::reassign_fields(&deoptee, &map, objects, realloc_failures, skip_internal);
+#ifndef PRODUCT
+if (TraceDeoptimization) {
+ttyLocker ttyl;
+tty->print_cr("REALLOC OBJECTS in thread " INTPTR_FORMAT, p2i(thread));
+Deoptimization::print_objects(objects, realloc_failures);
+}
+#endif
+}
+if (save_oop_result) {
+// Restore result.
+deoptee.set_saved_oop_result(&map, return_value());
+}
+return realloc_failures;
+}
+static void eliminate_locks(JavaThread* thread, GrowableArray<compiledVFrame*>* chunk, bool realloc_failures) {
+#ifndef PRODUCT
+bool first = true;
+#endif
+for (int i = 0; i < chunk->length(); i++) {
+compiledVFrame* cvf = chunk->at(i);
+assert (cvf->scope() != NULL,"expect only compiled java frames");
+GrowableArray<MonitorInfo*>* monitors = cvf->monitors();
+if (monitors->is_nonempty()) {
+Deoptimization::relock_objects(monitors, thread, realloc_failures);
+#ifndef PRODUCT
+if (PrintDeoptimizationDetails) {
+ttyLocker ttyl;
+for (int j = 0; j < monitors->length(); j++) {
+MonitorInfo* mi = monitors->at(j);
+if (mi->eliminated()) {
+if (first) {
+first = false;
+tty->print_cr("RELOCK OBJECTS in thread " INTPTR_FORMAT, p2i(thread));
+}
+if (mi->owner_is_scalar_replaced()) {
+Klass* k = java_lang_Class::as_Klass(mi->owner_klass());
+tty->print_cr("     failed reallocation for klass %s", k->external_name());
+} else {
+tty->print_cr("     object <" INTPTR_FORMAT "> locked", p2i(mi->owner()));
+}
+}
+}
+}
+#endif // !PRODUCT
+}
+}
+}
+#endif // COMPILER2_OR_JVMCI
 // This is factored, since it is both called from a JRT_LEAF (deoptimization) and a JRT_ENTRY (uncommon_trap)
 Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread* thread, int exec_mode) {
 // Note: there is a safepoint safety issue here. No matter whether we enter
 chunk->push(compiledVFrame::cast(vf));
 bool realloc_failures = false;
 #if COMPILER2_OR_JVMCI
+#if INCLUDE_JVMCI
+bool jvmci_enabled = true;
+#else
+bool jvmci_enabled = false;
+#endif
 // Reallocate the non-escaping objects and restore their fields. Then
 // relock objects if synchronization on them was eliminated.
-#if !INCLUDE_JVMCI
+if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateAllocations)) {
-if (DoEscapeAnalysis || EliminateNestedLocks) {
+realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk);
-if (EliminateAllocations) {
+}
-#endif // INCLUDE_JVMCI
+#endif // COMPILER2_OR_JVMCI
-assert (chunk->at(0)->scope() != NULL,"expect only compiled java frames");
-GrowableArray<ScopeValue*>* objects = chunk->at(0)->scope()->objects();
+// Revoke biases, done with in java state.
+// No safepoints allowed after this
-// The flag return_oop() indicates call sites which return oop
+revoke_from_deopt_handler(thread, deoptee, &map);
-// in compiled code. Such sites include java method calls,
-// runtime calls (for example, used to allocate new objects/arrays
+// Ensure that no safepoint is taken after pointers have been stored
-// on slow code path) and any other calls generated in compiled code.
+// in fields of rematerialized objects.  If a safepoint occurs from here on
-// It is not guaranteed that we can get such information here only
+// out the java state residing in the vframeArray will be missed.
-// by analyzing bytecode in deoptimized frames. This is why this flag
+// Locks may be rebaised in a safepoint.
-// is set during method compilation (see Compile::Process_OopMap_Node()).
+NoSafepointVerifier no_safepoint;
-// If the previous frame was popped or if we are dispatching an exception,
-// we don't have an oop result.
+#if COMPILER2_OR_JVMCI
-bool save_oop_result = chunk->at(0)->scope()->return_oop() && !thread->popframe_forcing_deopt_reexecution() && (exec_mode == Unpack_deopt);
+if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks)) {
-Handle return_value;
+eliminate_locks(thread, chunk, realloc_failures);
-if (save_oop_result) {
+}
-// Reallocation may trigger GC. If deoptimization happened on return from
-// call which returns oop we need to save it since it is not in oopmap.
-oop result = deoptee.saved_oop_result(&map);
-assert(oopDesc::is_oop_or_null(result), "must be oop");
-return_value = Handle(thread, result);
-assert(Universe::heap()->is_in_or_null(result), "must be heap pointer");
-if (TraceDeoptimization) {
-ttyLocker ttyl;
-tty->print_cr("SAVED OOP RESULT " INTPTR_FORMAT " in thread " INTPTR_FORMAT, p2i(result), p2i(thread));
-}
-}
-if (objects != NULL) {
-JRT_BLOCK
-realloc_failures = realloc_objects(thread, &deoptee, &map, objects, THREAD);
-JRT_END
-bool skip_internal = (cm != NULL) && !cm->is_compiled_by_jvmci();
-reassign_fields(&deoptee, &map, objects, realloc_failures, skip_internal);
-#ifndef PRODUCT
-if (TraceDeoptimization) {
-ttyLocker ttyl;
-tty->print_cr("REALLOC OBJECTS in thread " INTPTR_FORMAT, p2i(thread));
-print_objects(objects, realloc_failures);
-}
-#endif
-}
-if (save_oop_result) {
-// Restore result.
-deoptee.set_saved_oop_result(&map, return_value());
-}
-#if !INCLUDE_JVMCI
-}
-if (EliminateLocks) {
-#endif // INCLUDE_JVMCI
-#ifndef PRODUCT
-bool first = true;
-#endif
-for (int i = 0; i < chunk->length(); i++) {
-compiledVFrame* cvf = chunk->at(i);
-assert (cvf->scope() != NULL,"expect only compiled java frames");
-GrowableArray<MonitorInfo*>* monitors = cvf->monitors();
-if (monitors->is_nonempty()) {
-relock_objects(monitors, thread, realloc_failures);
-#ifndef PRODUCT
-if (PrintDeoptimizationDetails) {
-ttyLocker ttyl;
-for (int j = 0; j < monitors->length(); j++) {
-MonitorInfo* mi = monitors->at(j);
-if (mi->eliminated()) {
-if (first) {
-first = false;
-tty->print_cr("RELOCK OBJECTS in thread " INTPTR_FORMAT, p2i(thread));
-}
-if (mi->owner_is_scalar_replaced()) {
-Klass* k = java_lang_Class::as_Klass(mi->owner_klass());
-tty->print_cr("     failed reallocation for klass %s", k->external_name());
-} else {
-tty->print_cr("     object <" INTPTR_FORMAT "> locked", p2i(mi->owner()));
-}
-}
-}
-}
-#endif // !PRODUCT
-}
-}
-#if !INCLUDE_JVMCI
-}
-}
-#endif // INCLUDE_JVMCI
 #endif // COMPILER2_OR_JVMCI
 ScopeDesc* trap_scope = chunk->at(0)->scope();
 Handle exceptionObject;
 if (trap_scope->rethrow_exception()) {
 guarantee(expressions != NULL && expressions->length() > 0, "must have exception to throw");
 ScopeValue* topOfStack = expressions->top();
 exceptionObject = StackValue::create_stack_value(&deoptee, &map, topOfStack)->get_obj();
 guarantee(exceptionObject() != NULL, "exception oop can not be null");
 }
-// Ensure that no safepoint is taken after pointers have been stored
-// in fields of rematerialized objects.  If a safepoint occurs from here on
-// out the java state residing in the vframeArray will be missed.
-NoSafepointVerifier no_safepoint;
 vframeArray* array = create_vframeArray(thread, deoptee, &map, chunk, realloc_failures);
 #if COMPILER2_OR_JVMCI
 if (realloc_failures) {
 pop_frames_failed_reallocs(thread, array);
 return bt;
 JRT_END
+class DeoptimizeMarkedTC : public ThreadClosure {
-int Deoptimization::deoptimize_dependents() {
+public:
-Threads::deoptimized_wrt_marked_nmethods();
+virtual void do_thread(Thread* thread) {
-return 0;
+assert(thread->is_Java_thread(), "must be");
+JavaThread* jt = (JavaThread*)thread;
+jt->deoptimize_marked_methods();
+}
+};
+void Deoptimization::deoptimize_all_marked() {
+ResourceMark rm;
+DeoptimizationMarker dm;
+if (SafepointSynchronize::is_at_safepoint()) {
+DeoptimizeMarkedTC deopt;
+// Make the dependent methods not entrant
+CodeCache::make_marked_nmethods_not_entrant();
+Threads::java_threads_do(&deopt);
+} else {
+// Make the dependent methods not entrant
+{
+MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+CodeCache::make_marked_nmethods_not_entrant();
+}
+DeoptimizeMarkedTC deopt;
+Handshake::execute(&deopt);
+}
 }
 Deoptimization::DeoptAction Deoptimization::_unloaded_action
 = Deoptimization::Action_reinterpret;
 objects_to_revoke->append(Handle(thread, mon_info->owner()));
 }
 }
 }
+static void get_monitors_from_stack(GrowableArray<Handle>* objects_to_revoke, JavaThread* thread, frame fr, RegisterMap* map) {
-void Deoptimization::revoke_biases_of_monitors(JavaThread* thread, frame fr, RegisterMap* map) {
-if (!UseBiasedLocking) {
-return;
-}
-GrowableArray<Handle>* objects_to_revoke = new GrowableArray<Handle>();
 // Unfortunately we don't have a RegisterMap available in most of
 // the places we want to call this routine so we need to walk the
 // stack again to update the register map.
 if (map == NULL || !map->update_map()) {
 StackFrameStream sfs(thread, true);
 while (!cvf->is_top()) {
 collect_monitors(cvf, objects_to_revoke);
 cvf = compiledVFrame::cast(cvf->sender());
 }
 collect_monitors(cvf, objects_to_revoke);
+}
-if (SafepointSynchronize::is_at_safepoint()) {
-BiasedLocking::revoke_at_safepoint(objects_to_revoke);
+void Deoptimization::revoke_from_deopt_handler(JavaThread* thread, frame fr, RegisterMap* map) {
-} else {
+if (!UseBiasedLocking) {
-BiasedLocking::revoke(objects_to_revoke, thread);
+return;
+}
+GrowableArray<Handle>* objects_to_revoke = new GrowableArray<Handle>();
+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");
 }
 }
 void Deoptimization::deoptimize_single_frame(JavaThread* thread, frame fr, Deoptimization::DeoptReason reason) {
 // Patch the compiled method so that when execution returns to it we will
 // deopt the execution state and return to the interpreter.
 fr.deoptimize(thread);
 }
-void Deoptimization::deoptimize(JavaThread* thread, frame fr, RegisterMap *map) {
-deoptimize(thread, fr, map, Reason_constraint);
-}
 void Deoptimization::deoptimize(JavaThread* thread, frame fr, RegisterMap *map, DeoptReason reason) {
 // Deoptimize only if the frame comes from compile code.
 // Do not deoptimize the frame which is already patched
 // during the execution of the loops below.
 if (!fr.is_compiled_frame() || fr.is_deoptimized_frame()) {
 return;
 }
 ResourceMark rm;
 DeoptimizationMarker dm;
-if (UseBiasedLocking) {
-revoke_biases_of_monitors(thread, fr, map);
-}
 deoptimize_single_frame(thread, fr, reason);
 }
 #if INCLUDE_JVMCI
 address Deoptimization::deoptimize_for_missing_exception_handler(CompiledMethod* cm) {
 // there is no exception handler for this pc => deoptimize
 Events::log_deopt_message(thread, "Uncommon trap: trap_request=" PTR32_FORMAT " fr.pc=" INTPTR_FORMAT " relative=" INTPTR_FORMAT,
 trap_request, p2i(fr.pc()), fr.pc() - fr.cb()->code_begin());
 {
 ResourceMark rm;
-// Revoke biases of any monitors in the frame to ensure we can migrate them
-revoke_biases_of_monitors(thread, fr, &reg_map);
 DeoptReason reason = trap_request_reason(trap_request);
 DeoptAction action = trap_request_action(trap_request);
 #if INCLUDE_JVMCI
 int debug_id = trap_request_debug_id(trap_request);

changeset 58226	408c445d04e8
parent 57893	49fea19f0726
child 58545	725244418646