--- a/src/hotspot/share/code/nmethod.cpp Thu Dec 20 10:41:45 2018 +0100
+++ b/src/hotspot/share/code/nmethod.cpp Thu Dec 20 10:41:45 2018 +0100
@@ -1283,6 +1283,13 @@
flush_dependencies(/*delete_immediately*/true);
}
+ // Clear ICStubs to prevent back patching stubs of zombie or flushed
+ // nmethods during the next safepoint (see ICStub::finalize).
+ {
+ CompiledICLocker ml(this);
+ clear_ic_stubs();
+ }
+
// zombie only - if a JVMTI agent has enabled the CompiledMethodUnload
// event and it hasn't already been reported for this nmethod then
// report it now. The event may have been reported earlier if the GC