jdk-sandbox: comparison hotspot/src/share/vm/code/nmethod.cpp

equal deleted inserted replaced

-:e9d05f193287
+:82170e5767c3
 // Unregister must be done before the state change
 Universe::heap()->unregister_nmethod(this);
 _state = unloaded;
+// Log the unloading.
+log_state_change();
 #if INCLUDE_JVMCI
 // The method can only be unloaded after the pointer to the installed code
 // Java wrapper is no longer alive. Here we need to clear out this weak
 // reference to the dead object. Nulling out the reference has to happen
 // after the method is unregistered since the original value may be still
 // tracked by the rset.
 maybe_invalidate_installed_code();
-#endif
+// Clear these out after the nmethod has been unregistered and any
+// updates to the InstalledCode instance have been performed.
-// Log the unloading.
+_jvmci_installed_code = NULL;
-log_state_change();
+_speculation_log = NULL;
+#endif
 // The Method* is gone at this point
 assert(_method == NULL, "Tautology");
 set_osr_link(NULL);
 // Change state
 _state = state;
 // Log the transition once
 log_state_change();
+// Invalidate while holding the patching lock
+JVMCI_ONLY(maybe_invalidate_installed_code());
 // Remove nmethod from method.
 // We need to check if both the _code and _from_compiled_code_entry_point
 // refer to this nmethod because there is a race in setting these two fields
 // in Method* as seen in bugid 4947125.
 // safepoint can sneak in, otherwise the oops used by the
 // dependency logic could have become stale.
 MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 if (nmethod_needs_unregister) {
 Universe::heap()->unregister_nmethod(this);
+#ifdef JVMCI
+_jvmci_installed_code = NULL;
+_speculation_log = NULL;
+#endif
 }
 flush_dependencies(NULL);
 }
 // zombie only - if a JVMTI agent has enabled the CompiledMethodUnload
 // nmethod is in zombie state
 set_method(NULL);
 } else {
 assert(state == not_entrant, "other cases may need to be handled differently");
 }
-JVMCI_ONLY(maybe_invalidate_installed_code());
 if (TraceCreateZombies) {
 ResourceMark m;
 tty->print_cr("nmethod <" INTPTR_FORMAT "> %s code made %s", p2i(this), this->method() ? this->method()->name_and_sig_as_C_string() : "null", (state == not_entrant) ? "not entrant" : "zombie");
 }
 #endif // !PRODUCT
 #if INCLUDE_JVMCI
 void nmethod::clear_jvmci_installed_code() {
-// This must be done carefully to maintain nmethod remembered sets properly
+// write_ref_method_pre/post can only be safely called at a
-BarrierSet* bs = Universe::heap()->barrier_set();
+// safepoint or while holding the CodeCache_lock
-bs->write_ref_nmethod_pre(&_jvmci_installed_code, this);
+assert(CodeCache_lock->is_locked() ||
-_jvmci_installed_code = NULL;
+SafepointSynchronize::is_at_safepoint(), "should be performed under a lock for consistency");
-bs->write_ref_nmethod_post(&_jvmci_installed_code, this);
+if (_jvmci_installed_code != NULL) {
+// This must be done carefully to maintain nmethod remembered sets properly
+BarrierSet* bs = Universe::heap()->barrier_set();
+bs->write_ref_nmethod_pre(&_jvmci_installed_code, this);
+_jvmci_installed_code = NULL;
+bs->write_ref_nmethod_post(&_jvmci_installed_code, this);
+}
 }
 void nmethod::maybe_invalidate_installed_code() {
-if (_jvmci_installed_code != NULL) {
+assert(Patching_lock->is_locked() ||
-if (!is_alive()) {
+SafepointSynchronize::is_at_safepoint(), "should be performed under a lock for consistency");
-// Break the link between nmethod and InstalledCode such that the nmethod
+oop installed_code = jvmci_installed_code();
-// can subsequently be flushed safely.  The link must be maintained while
+if (installed_code != NULL) {
-// the method could have live activations since invalidateInstalledCode
+nmethod* nm = (nmethod*)InstalledCode::address(installed_code);
-// might want to invalidate all existing activations.
+if (nm == NULL || nm != this) {
-InstalledCode::set_address(_jvmci_installed_code, 0);
+// The link has been broken or the InstalledCode instance is
-InstalledCode::set_entryPoint(_jvmci_installed_code, 0);
+// associated with another nmethod so do nothing.
-clear_jvmci_installed_code();
+return;
-} else if (is_not_entrant()) {
+}
-InstalledCode::set_entryPoint(_jvmci_installed_code, 0);
+if (!is_alive()) {
-}
+// Break the link between nmethod and InstalledCode such that the nmethod
+// can subsequently be flushed safely.  The link must be maintained while
+// the method could have live activations since invalidateInstalledCode
+// might want to invalidate all existing activations.
+InstalledCode::set_address(installed_code, 0);
+InstalledCode::set_entryPoint(installed_code, 0);
+} else if (is_not_entrant()) {
+// Remove the entry point so any invocation will fail but keep
+// the address link around that so that existing activations can
+// be invalidated.
+InstalledCode::set_entryPoint(installed_code, 0);
+}
+}
+}
+void nmethod::invalidate_installed_code(Handle installedCode, TRAPS) {
+if (installedCode() == NULL) {
+THROW(vmSymbols::java_lang_NullPointerException());
+}
+jlong nativeMethod = InstalledCode::address(installedCode);
+nmethod* nm = (nmethod*)nativeMethod;
+if (nm == NULL) {
+// Nothing to do
+return;
+}
+nmethodLocker nml(nm);
+#ifdef ASSERT
+{
+MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
+// This relationship can only be checked safely under a lock
+assert(nm == NULL || !nm->is_alive() || nm->jvmci_installed_code() == installedCode(), "sanity check");
+}
+#endif
+if (nm->is_alive()) {
+// The nmethod state machinery maintains the link between the
+// HotSpotInstalledCode and nmethod* so as long as the nmethod appears to be
+// alive assume there is work to do and deoptimize the nmethod.
+nm->mark_for_deoptimization();
+VM_Deoptimize op;
+VMThread::execute(&op);
+}
+MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
+// Check that it's still associated with the same nmethod and break
+// the link if it is.
+if (InstalledCode::address(installedCode) == nativeMethod) {
+InstalledCode::set_address(installedCode, 0);
 }
 }
 char* nmethod::jvmci_installed_code_name(char* buf, size_t buflen) {
 if (!this->is_compiled_by_jvmci()) {

changeset 35092	82170e5767c3
parent 35086	bbf32241d851
child 35108	ccb4e1f2a6cf