Mercurial > hg > graal-jvmci-8

comparison 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
comparison
equal deleted inserted replaced
22786:ac649db7fec4 23286:dd9cc155639c
728 (BasicObjectLock *) stack->alloc(monitor_words * wordSize); 728 (BasicObjectLock *) stack->alloc(monitor_words * wordSize);
729 oop object; 729 oop object;
730 if (method->is_static()) 730 if (method->is_static())
731 object = method->constants()->pool_holder()->java_mirror(); 731 object = method->constants()->pool_holder()->java_mirror();
732 else 732 else
733 object = (oop) locals[0]; 733 object = (oop) (void*)locals[0];
734 monitor->set_obj(object); 734 monitor->set_obj(object);
735 } 735 }
736 736
737 istate->set_stack_base(stack->sp()); 737 istate->set_stack_base(stack->sp());
738 istate->set_stack(stack->sp() - 1); 738 istate->set_stack(stack->sp() - 1);