8316694: Implement relocation of nmethod within CodeCache

src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp

@@ -90,7 +90,6 @@ void Relocation::pd_set_call_destination(address x) {
 
 void trampoline_stub_Relocation::pd_fix_owner_after_move() {
   NativeCall* call = nativeCall_at(owner());
-  assert(call->raw_destination() == owner(), "destination should be empty");
   address trampoline = addr();
   address dest = nativeCallTrampolineStub_at(trampoline)->destination();
   if (!Assembler::reachable_from_branch_at(owner(), dest)) {

src/hotspot/share/code/codeBehaviours.cpp

@@ -23,23 +23,24 @@
  */
 
 #include "code/codeBehaviours.hpp"
+#include "code/nmethod.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
 
 CompiledICProtectionBehaviour* CompiledICProtectionBehaviour::_current = nullptr;
 
-bool DefaultICProtectionBehaviour::lock(nmethod* method) {
-  if (is_safe(method)) {
+bool DefaultICProtectionBehaviour::lock(nmethod* nm) {
+  if (is_safe(nm)) {
     return false;
   }
   CompiledIC_lock->lock_without_safepoint_check();
   return true;
 }
 
-void DefaultICProtectionBehaviour::unlock(nmethod* method) {
+void DefaultICProtectionBehaviour::unlock(nmethod* nm) {
   CompiledIC_lock->unlock();
 }
 
-bool DefaultICProtectionBehaviour::is_safe(nmethod* method) {
-  return SafepointSynchronize::is_at_safepoint() || CompiledIC_lock->owned_by_self();
+bool DefaultICProtectionBehaviour::is_safe(nmethod* nm) {
+  return SafepointSynchronize::is_at_safepoint() || CompiledIC_lock->owned_by_self() || (NMethodState_lock->owned_by_self() && nm->is_not_installed());
 }

src/hotspot/share/code/codeBehaviours.hpp

@@ -33,18 +33,18 @@ class CompiledICProtectionBehaviour {
   static CompiledICProtectionBehaviour* _current;
 
 public:
-  virtual bool lock(nmethod* method) = 0;
-  virtual void unlock(nmethod* method) = 0;
-  virtual bool is_safe(nmethod* method) = 0;
+  virtual bool lock(nmethod* nm) = 0;
+  virtual void unlock(nmethod* nm) = 0;
+  virtual bool is_safe(nmethod* nm) = 0;
 
   static CompiledICProtectionBehaviour* current() { return _current; }
   static void set_current(CompiledICProtectionBehaviour* current) { _current = current; }
 };
 
 class DefaultICProtectionBehaviour: public CompiledICProtectionBehaviour, public CHeapObj<mtInternal> {
-  virtual bool lock(nmethod* method);
-  virtual void unlock(nmethod* method);
-  virtual bool is_safe(nmethod* method);
+  virtual bool lock(nmethod* nm);
+  virtual void unlock(nmethod* nm);
+  virtual bool is_safe(nmethod* nm);
 };
 
 #endif // SHARE_CODE_CODEBEHAVIOURS_HPP

src/hotspot/share/code/codeCache.hpp

@@ -259,7 +259,7 @@ class CodeCache : AllStatic {
   static bool heap_available(CodeBlobType code_blob_type);
 
   // Returns the CodeBlobType for the given nmethod
-  static CodeBlobType get_code_blob_type(nmethod* nm) {
+  static CodeBlobType get_code_blob_type(const nmethod* nm) {
     return get_code_heap(nm)->code_blob_type();
   }
 

src/hotspot/share/code/compiledIC.cpp

@@ -55,8 +55,8 @@ CompiledICLocker::~CompiledICLocker() {
   }
 }
 
-bool CompiledICLocker::is_safe(nmethod* method) {
-  return CompiledICProtectionBehaviour::current()->is_safe(method);
+bool CompiledICLocker::is_safe(nmethod* nm) {
+  return CompiledICProtectionBehaviour::current()->is_safe(nm);
 }
 
 bool CompiledICLocker::is_safe(address code) {

src/hotspot/share/code/compiledIC.hpp

@@ -50,7 +50,7 @@ class CompiledICLocker: public StackObj {
 public:
   CompiledICLocker(nmethod* method);
   ~CompiledICLocker();
-  static bool is_safe(nmethod* method);
+  static bool is_safe(nmethod* nm);
   static bool is_safe(address code);
 };