src/hotspot/share/oops/method.hpp

rev 54697 : imported patch 8221734-v2-merge
rev 54698 : imported patch 8221734-v2

@@ -461,11 +461,19 @@
 
   // nmethod/verified compiler entry
   address verified_code_entry();
   bool check_code() const;      // Not inline to avoid circular ref
   CompiledMethod* volatile code() const;
-  void clear_code(bool acquire_lock = true);    // Clear out any compiled code
+
+  static void unlink_code(Method *method, CompiledMethod *compare);
+  static void unlink_code(Method *method);
+
+private:
+  // Either called with CompiledMethod_lock held or from constructor.
+  void clear_code();
+
+public:
   static void set_code(const methodHandle& mh, CompiledMethod* code);
   void set_adapter_entry(AdapterHandlerEntry* adapter) {
     constMethod()->set_adapter_entry(adapter);
   }
   void update_adapter_trampoline(AdapterHandlerEntry* adapter) {