Mercurial > hg > truffle

diff src/cpu/ppc/vm/frame_ppc.cpp @ 14433:018b357638aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/frame_ppc.cpp	Sat Nov 16 01:42:55 2013 +0100
+++ b/src/cpu/ppc/vm/frame_ppc.cpp	Tue Nov 19 11:53:58 2013 -0800
@@ -188,7 +188,7 @@
       case T_OBJECT:
       case T_ARRAY: {
         oop* obj_p = *(oop**)lresult;
-        oop obj = (obj_p == NULL) ? NULL : *obj_p;
+        oop obj = (obj_p == NULL) ? (oop)NULL : *obj_p;
         assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check");
         *oop_result = obj;
         break;