From ac3f5df7092b9b99f6eb4a403b206ef0b47d4af1 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@bitrange.com>
Date: Thu, 1 Jan 2004 17:17:00 +0000
Subject: [PATCH] builtins.c (expand_builtin_apply_args_1): Call force_operand
 on plus_constant result.

	* builtins.c (expand_builtin_apply_args_1) [STACK_GROWS_DOWNWARD]:
	Call force_operand on plus_constant result.

From-SVN: r75306
---
 gcc/ChangeLog  | 5 +++++
 gcc/builtins.c | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 227149518a9a..7187c9116dec 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-01  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* builtins.c (expand_builtin_apply_args_1) [STACK_GROWS_DOWNWARD]:
+	Call force_operand on plus_constant result.
+
 2004-01-01  Jan Hubicka  <jh@suse.cz>
 
 	* expmed.c (store_bit_field, extract_bit_field): Use new named patterns
diff --git a/gcc/builtins.c b/gcc/builtins.c
index c5af18d7182c..df93f48238e6 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -1128,8 +1128,11 @@ expand_builtin_apply_args_1 (void)
   tem = copy_to_reg (virtual_incoming_args_rtx);
 #ifdef STACK_GROWS_DOWNWARD
   /* We need the pointer as the caller actually passed them to us, not
-     as we might have pretended they were passed.  */
-  tem = plus_constant (tem, current_function_pretend_args_size);
+     as we might have pretended they were passed.  Make sure it's a valid
+     operand, as emit_move_insn isn't expected to handle a PLUS.  */
+  tem
+    = force_operand (plus_constant (tem, current_function_pretend_args_size),
+		     NULL_RTX);
 #endif
   emit_move_insn (adjust_address (registers, Pmode, 0), tem);
   
-- 
GitLab