From: Martin Jambor <mjambor@suse.cz>
Date: Wed, 24 Jan 2024 19:35:00 +0000 (+0100)
Subject: sra: Disqualify bases of operands of asm gotos
X-Git-Tag: releases/gcc-13.3.0~535
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b7204c52392c1c0da9c91a5feae0c44018a6f37;p=thirdparty%2Fgcc.git

sra: Disqualify bases of operands of asm gotos

PR 110422 shows that SRA can ICE assuming there is a single edge
outgoing from a block terminated with an asm goto.  We need that for
BB-terminating statements so that any adjustments they make to the
aggregates can be copied over to their replacements.  Because we can't
have that after ASM gotos, we need to punt.

gcc/ChangeLog:

2024-01-17  Martin Jambor  <mjambor@suse.cz>

	PR tree-optimization/110422
	* tree-sra.cc (scan_function): Disqualify bases of operands of asm
	gotos.

gcc/testsuite/ChangeLog:

2024-01-17  Martin Jambor  <mjambor@suse.cz>

	PR tree-optimization/110422
	* gcc.dg/torture/pr110422.c: New test.

(cherry picked from commit 6764043e88a4208f7c69bf0ccd19ddc7a6016fb1)
---

diff --git a/gcc/testsuite/gcc.dg/torture/pr110422.c b/gcc/testsuite/gcc.dg/torture/pr110422.c
new file mode 100644
index 000000000000..2e171a7a19e5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr110422.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+struct T { int x; };
+int foo(void) {
+  struct T v;
+  asm goto("" : "+r"(v.x) : : : lab);
+  return 0;
+lab:
+  return -5;
+}
diff --git a/gcc/tree-sra.cc b/gcc/tree-sra.cc
index ad0c738645d7..7fdc3bb957d3 100644
--- a/gcc/tree-sra.cc
+++ b/gcc/tree-sra.cc
@@ -1413,15 +1413,32 @@ scan_function (void)
 		gasm *asm_stmt = as_a <gasm *> (stmt);
 		walk_stmt_load_store_addr_ops (asm_stmt, NULL, NULL, NULL,
 					       asm_visit_addr);
-		for (i = 0; i < gimple_asm_ninputs (asm_stmt); i++)
+		if (stmt_ends_bb_p (asm_stmt)
+		    && !single_succ_p (gimple_bb (asm_stmt)))
 		  {
-		    t = TREE_VALUE (gimple_asm_input_op (asm_stmt, i));
-		    ret |= build_access_from_expr (t, asm_stmt, false);
+		    for (i = 0; i < gimple_asm_ninputs (asm_stmt); i++)
+		      {
+			t = TREE_VALUE (gimple_asm_input_op (asm_stmt, i));
+			disqualify_base_of_expr (t, "OP of asm goto.");
+		      }
+		    for (i = 0; i < gimple_asm_noutputs (asm_stmt); i++)
+		      {
+			t = TREE_VALUE (gimple_asm_output_op (asm_stmt, i));
+			disqualify_base_of_expr (t, "OP of asm goto.");
+		      }
 		  }
-		for (i = 0; i < gimple_asm_noutputs (asm_stmt); i++)
+		else
 		  {
-		    t = TREE_VALUE (gimple_asm_output_op (asm_stmt, i));
-		    ret |= build_access_from_expr (t, asm_stmt, true);
+		    for (i = 0; i < gimple_asm_ninputs (asm_stmt); i++)
+		      {
+			t = TREE_VALUE (gimple_asm_input_op (asm_stmt, i));
+			ret |= build_access_from_expr (t, asm_stmt, false);
+		      }
+		    for (i = 0; i < gimple_asm_noutputs (asm_stmt); i++)
+		      {
+			t = TREE_VALUE (gimple_asm_output_op (asm_stmt, i));
+			ret |= build_access_from_expr (t, asm_stmt, true);
+		      }
 		  }
 	      }
 	      break;