Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/cppInterpreter_x86.cpp @ 13086:096c224171c4
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 20 Nov 2013 00:10:38 +0100 |
| parents | bd3237e0e18d |
| children | d3f14809b051 2100bf712e2a |
line wrap: on
line diff
--- a/src/cpu/x86/vm/cppInterpreter_x86.cpp Tue Nov 19 17:44:26 2013 +0100 +++ b/src/cpu/x86/vm/cppInterpreter_x86.cpp Wed Nov 20 00:10:38 2013 +0100 @@ -367,7 +367,7 @@ return entry; } -address CppInterpreter::return_entry(TosState state, int length) { +address CppInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) { // make it look good in the debugger return CAST_FROM_FN_PTR(address, RecursiveInterpreterActivation); }