Mercurial > hg > truffle
changeset 3911:2fecca53a2c6
7085012: ARM: com/sun/jdi/PopSynchronousTest.java still fails
Summary: InterpreterRuntime::popframe_move_outgoing_args() is required for the ARM interpreter.
Reviewed-by: kvn, twisti
author | roland |
---|---|
date | Wed, 07 Sep 2011 14:15:07 +0200 |
parents | 4668545121b8 |
children | 5596e125fe4f |
files | src/share/vm/interpreter/interpreterRuntime.cpp src/share/vm/interpreter/interpreterRuntime.hpp |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp Fri Sep 02 21:33:57 2011 -0700 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Wed Sep 07 14:15:07 2011 +0200 @@ -1244,7 +1244,7 @@ // preparing the same method will be sure to see non-null entry & mirror. IRT_END -#if defined(IA32) || defined(AMD64) +#if defined(IA32) || defined(AMD64) || defined(ARM) IRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address)) if (src_address == dest_address) { return;
--- a/src/share/vm/interpreter/interpreterRuntime.hpp Fri Sep 02 21:33:57 2011 -0700 +++ b/src/share/vm/interpreter/interpreterRuntime.hpp Wed Sep 07 14:15:07 2011 +0200 @@ -141,8 +141,8 @@ methodOopDesc* method, intptr_t* from, intptr_t* to); -#if defined(IA32) || defined(AMD64) - // Popframe support (only needed on x86 and AMD64) +#if defined(IA32) || defined(AMD64) || defined(ARM) + // Popframe support (only needed on x86, AMD64 and ARM) static void popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address); #endif