--- a/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp	Fri Oct 11 08:49:42 2019 -0400
+++ b/src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp	Thu Oct 10 10:59:13 2019 +0100
@@ -185,6 +185,10 @@
   NativeMovConstReg* method_holder
     = nativeMovConstReg_at(stub + NativeInstruction::instruction_size);
   method_holder->set_data(0);
+  if (!static_stub->is_aot()) {
+    NativeJump* jump = nativeJump_at(method_holder->next_instruction_address());
+    jump->set_jump_destination((address)-1);
+  }
 }
 
 //-----------------------------------------------------------------------------