--- a/hotspot/src/share/vm/runtime/frame.hpp	Wed Jun 28 19:12:58 2017 -0400
+++ b/hotspot/src/share/vm/runtime/frame.hpp	Thu Jun 29 14:22:42 2017 +0200
@@ -387,8 +387,8 @@
   // Add annotated descriptions of memory locations belonging to this frame to values
   void describe(FrameValues& values, int frame_no);
 
-  // Conversion from an VMReg to physical stack location
-  oop* oopmapreg_to_location(VMReg reg, const RegisterMap* regmap) const;
+  // Conversion from a VMReg to physical stack location
+  oop* oopmapreg_to_location(VMReg reg, const RegisterMap* reg_map) const;
 
   // Oops-do's
   void oops_compiled_arguments_do(Symbol* signature, bool has_receiver, bool has_appendix, const RegisterMap* reg_map, OopClosure* f);