changeset 6918:03b8d901bdea

Merge
author coleenp
date Fri, 15 Aug 2014 20:37:43 +0000
parents af24453bcd3e ce9fb9e64334
children 83b971c5423f f2417008f618
files
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Aug 15 11:25:55 2014 -0700
+++ b/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);
   }
 
--- a/src/cpu/zero/vm/frame_zero.inline.hpp	Fri Aug 15 11:25:55 2014 -0700
+++ b/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() {
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Aug 15 11:25:55 2014 -0700
+++ b/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);