changeset 26142 | 038e0f01b4a9 |
parent 25950 | b5c40ed1d349 |
child 26566 | 2fbb4a25bad0 |
--- 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); }