--- old/src/share/vm/aot/compiledIC_aot.hpp	2016-11-03 04:05:43.139247202 -0700
+++ new/src/share/vm/aot/compiledIC_aot.hpp	2016-11-03 04:05:43.054243430 -0700
@@ -24,17 +24,17 @@
 #ifndef SHARE_VM_AOT_COMPILEDIC_AOT_HPP
 #define SHARE_VM_AOT_COMPILEDIC_AOT_HPP
 
+#include "code/compiledIC.hpp"
 #include "code/nativeInst.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "oops/compiledICHolder.hpp"
-#include "code/compiledIC.hpp"
 
 class CompiledPltStaticCall: public CompiledStaticCall {
   friend class CompiledIC;
   friend class PltNativeCallWrapper;
 
   // Also used by CompiledIC
-  void set_to_interpreted(methodHandle callee, address entry);
+  void set_to_interpreted(const methodHandle& callee, address entry);
 
   address instruction_address() const { return _call->instruction_address(); }
   void set_destination_mt_safe(address dest) { _call->set_destination_mt_safe(dest); }
@@ -76,7 +76,7 @@
 
  protected:
   virtual address resolve_call_stub() const { return _call->plt_resolve_call(); }
-  virtual void set_to_far(methodHandle callee, address entry) { set_to_compiled(entry); }
+  virtual void set_to_far(const methodHandle& callee, address entry) { set_to_compiled(entry); }
   virtual const char* name() const { return "CompiledPltStaticCall"; }
 };