--- old/src/share/vm/aot/aotCompiledMethod.cpp	2016-11-03 04:05:41.185160486 -0700
+++ new/src/share/vm/aot/aotCompiledMethod.cpp	2016-11-03 04:05:41.098156625 -0700
@@ -23,6 +23,9 @@
 
 #include "precompiled.hpp"
 
+#include "aot/aotCodeHeap.hpp"
+#include "aot/aotLoader.hpp"
+#include "aot/compiledIC_aot.hpp"
 #include "code/codeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/nativeInst.hpp"
@@ -33,10 +36,6 @@
 #include "jvmci/compilerRuntime.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #include "oops/method.hpp"
-#include "aot/aotCompiledMethod.hpp"
-#include "aot/aotLoader.hpp"
-#include "aot/aotCodeHeap.hpp"
-#include "aot/compiledIC_aot.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -400,7 +399,7 @@
   }
 }
 
-void PltNativeCallWrapper::set_to_interpreted(methodHandle method, CompiledICInfo& info) {
+void PltNativeCallWrapper::set_to_interpreted(const methodHandle& method, CompiledICInfo& info) {
   assert(!info.to_aot(), "only for nmethod");
   CompiledPltStaticCall* csc = CompiledPltStaticCall::at(instruction_address());
   csc->set_to_interpreted(method, info.entry());