# HG changeset patch
# User roland
# Date 1315397707 -7200
# Node ID db9177a52cee9cef9862a6dbace1ce7e582c67db
# Parent  71714e44d255028dce6939e2de45d30a8819e166
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

diff -r 71714e44d255 -r db9177a52cee hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Fri Sep 02 21:33:57 2011 -0700
+++ b/hotspot/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;
diff -r 71714e44d255 -r db9177a52cee hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp	Fri Sep 02 21:33:57 2011 -0700
+++ b/hotspot/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