--- old/src/share/vm/code/compiledMethod.hpp	2016-11-03 14:16:23.000000000 -0700
+++ new/src/share/vm/code/compiledMethod.hpp	2016-11-03 14:16:23.000000000 -0700
@@ -35,6 +35,7 @@
 class AbstractCompiler;
 class xmlStream;
 class CompiledStaticCall;
+class NativeCallWrapper;
 
 // This class is used internally by nmethods, to cache
 // exception/pc/handler information.
@@ -334,6 +335,14 @@
   // corresponds to the given method as well.
   virtual bool is_dependent_on_method(Method* dependee) = 0;
 
+  virtual NativeCallWrapper* call_wrapper_at(address call) const = 0;
+  virtual NativeCallWrapper* call_wrapper_before(address return_pc) const = 0;
+  virtual address call_instruction_address(address pc) const = 0;
+
+  virtual CompiledStaticCall* compiledStaticCall_at(Relocation* call_site) const = 0;
+  virtual CompiledStaticCall* compiledStaticCall_at(address addr) const = 0;
+  virtual CompiledStaticCall* compiledStaticCall_before(address addr) const = 0;
+
   Method* attached_method(address call_pc);
   Method* attached_method_before_pc(address pc);