# HG changeset patch
# User coleenp
# Date 1408135063 0
# Node ID bb90f572f1a6c50d9547b4f9af6fe7c50f156a8d
# Parent  9f502e461cdee70e61b1779ce0a3f4162009e4d6# Parent  038e0f01b4a96f539c5818e7954b990133dc5305
Merge

diff -r 9f502e461cde -r bb90f572f1a6 hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Aug 15 11:25:55 2014 -0700
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Aug 15 20:37:43 2014 +0000
@@ -731,7 +731,7 @@
     if (method->is_static())
       object = method->constants()->pool_holder()->java_mirror();
     else
-      object = (oop) locals[0];
+      object = (oop) (void*)locals[0];
     monitor->set_obj(object);
   }
 
diff -r 9f502e461cde -r bb90f572f1a6 hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
--- a/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp	Fri Aug 15 11:25:55 2014 -0700
+++ b/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp	Fri Aug 15 20:37:43 2014 +0000
@@ -26,6 +26,8 @@
 #ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
 #define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
 
+#include "code/codeCache.hpp"
+
 // Constructors
 
 inline frame::frame() {
diff -r 9f502e461cde -r bb90f572f1a6 hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Aug 15 11:25:55 2014 -0700
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Aug 15 20:37:43 2014 +0000
@@ -3402,7 +3402,7 @@
   tty->print_cr("osr._osr_buf: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_buf);
   tty->print_cr("osr._osr_entry: " INTPTR_FORMAT, (uintptr_t) this->_result._osr._osr_entry);
   tty->print_cr("prev_link: " INTPTR_FORMAT, (uintptr_t) this->_prev_link);
-  tty->print_cr("native_mirror: " INTPTR_FORMAT, (uintptr_t) this->_oop_temp);
+  tty->print_cr("native_mirror: " INTPTR_FORMAT, (uintptr_t) p2i(this->_oop_temp));
   tty->print_cr("stack_base: " INTPTR_FORMAT, (uintptr_t) this->_stack_base);
   tty->print_cr("stack_limit: " INTPTR_FORMAT, (uintptr_t) this->_stack_limit);
   tty->print_cr("monitor_base: " INTPTR_FORMAT, (uintptr_t) this->_monitor_base);