Mercurial > hg > graal-jvmci-8

diff src/cpu/zero/vm/cppInterpreter_zero.cpp @ 23286:dd9cc155639c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u66-b17
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 07 Jan 2016 17:28:46 +0100
parents 7848fc12602b 6d13c17668d1
children b5f3a471e646
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Jan 22 12:48:57 2016 -1000
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Jan 07 17:28:46 2016 +0100
@@ -730,7 +730,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);
   }