diff -r 750c6edff33b -r 261b9d05b79d hotspot/src/share/vm/code/compiledMethod.cpp
--- a/hotspot/src/share/vm/code/compiledMethod.cpp	Thu Apr 13 09:57:51 2017 +0200
+++ b/hotspot/src/share/vm/code/compiledMethod.cpp	Tue Jul 04 18:36:50 2017 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "code/compiledIC.hpp"
+#include "code/compiledMethod.inline.hpp"
 #include "code/scopeDesc.hpp"
 #include "code/codeCache.hpp"
 #include "prims/methodHandles.hpp"
@@ -59,15 +60,6 @@
   return pd->is_method_handle_invoke();
 }
 
-// When using JVMCI the address might be off by the size of a call instruction.
-bool CompiledMethod::is_deopt_entry(address pc) {
-  return pc == deopt_handler_begin()
-#if INCLUDE_JVMCI
-    || (is_compiled_by_jvmci() && pc == (deopt_handler_begin() + NativeCall::instruction_size))
-#endif
-    ;
-}
-
 // Returns a string version of the method state.
 const char* CompiledMethod::state() const {
   int state = get_state();
@@ -315,22 +307,6 @@
 #endif // !SHARK
 }
 
-// -----------------------------------------------------------------------------
-// CompiledMethod::get_deopt_original_pc
-//
-// Return the original PC for the given PC if:
-// (a) the given PC belongs to a nmethod and
-// (b) it is a deopt PC
-address CompiledMethod::get_deopt_original_pc(const frame* fr) {
-  if (fr->cb() == NULL)  return NULL;
-
-  CompiledMethod* cm = fr->cb()->as_compiled_method_or_null();
-  if (cm != NULL && cm->is_deopt_pc(fr->pc()))
-    return cm->get_original_pc(fr);
-
-  return NULL;
-}
-
 Method* CompiledMethod::attached_method(address call_instr) {
   assert(code_contains(call_instr), "not part of the nmethod");
   RelocIterator iter(this, call_instr, call_instr + 1);