Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8055231: ZERO variant build is broken
authorcoleenp
Fri, 15 Aug 2014 15:25:24 -0400
changeset 26142 038e0f01b4a9
parent 26140 5d408e1fa677
child 26143 bb90f572f1a6
8055231: ZERO variant build is broken Summary: Fix zero build. Reviewed-by: coleenp Contributed-by: Severin Gehwolf <sgehwolf@redhat.com>
hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp file | annotate | diff | comparison | revisions
hotspot/src/cpu/zero/vm/frame_zero.inline.hpp file | annotate | diff | comparison | revisions
hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Aug 14 18:14:07 2014 -0700
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Aug 15 15:25:24 2014 -0400
@@ -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/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp	Thu Aug 14 18:14:07 2014 -0700
+++ b/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp	Fri Aug 15 15:25:24 2014 -0400
@@ -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/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Thu Aug 14 18:14:07 2014 -0700
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Aug 15 15:25:24 2014 -0400
@@ -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);
jdk-sandbox