changeset 22849 | b8670e920530 |
parent 22824 | 28258dd5cb2e |
child 22861 | f5c393d456fc |
--- a/hotspot/src/cpu/ppc/vm/frame_ppc.cpp Sat Nov 16 01:42:55 2013 +0100 +++ b/hotspot/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;