From: Jeff Law <jlaw@ventanamicro.com>
Date: Mon, 16 Oct 2023 23:14:38 +0000 (-0600)
Subject: Fix minor problem in stack probing
X-Git-Tag: basepoints/gcc-15~5469
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b626751a4e87b090531c648631df33ac20c4fab8;p=thirdparty%2Fgcc.git

Fix minor problem in stack probing

probe_stack_range has an assert to capture the possibility that that
expand_binop might not construct its result in the provided target.

We triggered that internally a little while ago.  I'm pretty sure it was in the
testsuite, so no new testcase.  The fix is easy, copy the result into the
proper target when needed.

Bootstrapped and regression tested on x86.

gcc/
	* explow.cc (probe_stack_range): Handle case when expand_binop
	does not construct its result in the expected location.
---

diff --git a/gcc/explow.cc b/gcc/explow.cc
index 6424c0802f07..0c03ac350bbe 100644
--- a/gcc/explow.cc
+++ b/gcc/explow.cc
@@ -1818,7 +1818,10 @@ probe_stack_range (HOST_WIDE_INT first, rtx size)
 			   gen_int_mode (PROBE_INTERVAL, Pmode), test_addr,
 			   1, OPTAB_WIDEN);
 
-      gcc_assert (temp == test_addr);
+      /* There is no guarantee that expand_binop constructs its result
+	 in TEST_ADDR.  So copy into TEST_ADDR if necessary.  */
+      if (temp != test_addr)
+	emit_move_insn (test_addr, temp);
 
       /* Probe at TEST_ADDR.  */
       emit_stack_probe (test_addr);