Mercurial > hg > truffle
diff src/cpu/ppc/vm/nativeInst_ppc.cpp @ 14433:018b357638aa
8028514: PPC64: Fix C++ Interpreter after '7195622: CheckUnhandledOops has limited usefulness now'
Summary: fix CPP-interpreter after CheckUnhandledOops was re-enabled in the fastdebug build
Reviewed-by: kvn, dholmes, lfoltan
author | simonis |
---|---|
date | Tue, 19 Nov 2013 11:53:58 -0800 |
parents | ec28f9c041ff |
children | 67fa91961822 |
line wrap: on
line diff
--- a/src/cpu/ppc/vm/nativeInst_ppc.cpp Sat Nov 16 01:42:55 2013 +0100 +++ b/src/cpu/ppc/vm/nativeInst_ppc.cpp Tue Nov 19 11:53:58 2013 -0800 @@ -188,7 +188,7 @@ return MacroAssembler::get_const(addr); } else if (MacroAssembler::is_set_narrow_oop(addr, cb->content_begin())) { narrowOop no = (narrowOop)MacroAssembler::get_narrow_oop(addr, cb->content_begin()); - return (intptr_t)oopDesc::decode_heap_oop(no); + return cast_from_oop<intptr_t>(oopDesc::decode_heap_oop(no)); } else { assert(MacroAssembler::is_load_const_from_method_toc_at(addr), "must be load_const_from_pool"); @@ -258,7 +258,7 @@ oop_Relocation *r = iter.oop_reloc(); if (oop_addr == NULL) { oop_addr = r->oop_addr(); - *oop_addr = (oop)data; + *oop_addr = cast_to_oop(data); } else { assert(oop_addr == r->oop_addr(), "must be only one set-oop here") ; }