--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Thu Jul 27 15:36:15 2017 +0200
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Thu Jul 27 18:06:41 2017 -0400
@@ -743,7 +743,7 @@
 
 #ifndef DEOPTIMIZE_WHEN_PATCHING
 
-static Klass* resolve_field_return_klass(methodHandle caller, int bci, TRAPS) {
+static Klass* resolve_field_return_klass(const methodHandle& caller, int bci, TRAPS) {
   Bytecode_field field_access(caller, bci);
   // This can be static or non-static field access
   Bytecodes::Code code       = field_access.code();