--- a/hotspot/src/share/vm/code/nmethod.cpp	Mon Oct 17 16:40:49 2016 -0700
+++ b/hotspot/src/share/vm/code/nmethod.cpp	Tue Oct 18 09:43:12 2016 +0200
@@ -1252,7 +1252,7 @@
     if (method() != NULL && (method()->code() == this ||
                              method()->from_compiled_entry() == verified_entry_point())) {
       HandleMark hm;
-      method()->clear_code();
+      method()->clear_code(false /* already owns Patching_lock */);
     }
   } // leave critical region under Patching_lock