Mercurial > hg > truffle
diff src/cpu/zero/vm/cppInterpreter_zero.cpp @ 14422:2b8e28fdf503
Merge
author | kvn |
---|---|
date | Tue, 05 Nov 2013 17:38:04 -0800 |
parents | abe03600372a bd3237e0e18d |
children | abec000618bf |
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Oct 16 10:52:41 2013 +0200 +++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Nov 05 17:38:04 2013 -0800 @@ -1006,7 +1006,7 @@ istate->set_stack_limit(stack_base - method->max_stack() - 1); } -address CppInterpreter::return_entry(TosState state, int length) { +address CppInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) { ShouldNotCallThis(); return NULL; }