]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
sra: Disqualify bases of operands of asm gotos
authorMartin Jambor <mjambor@suse.cz>
Wed, 24 Jan 2024 19:35:00 +0000 (20:35 +0100)
committerMartin Jambor <mjambor@suse.cz>
Wed, 24 Jan 2024 19:35:39 +0000 (20:35 +0100)
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)

gcc/testsuite/gcc.dg/torture/pr110422.c [new file with mode: 0644]
gcc/tree-sra.cc

diff --git a/gcc/testsuite/gcc.dg/torture/pr110422.c b/gcc/testsuite/gcc.dg/torture/pr110422.c
new file mode 100644 (file)
index 0000000..2e171a7
--- /dev/null
@@ -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;
+}
index ad0c738645d7f30e5efcb9ea09f3b5b7819ee237..7fdc3bb957d3407cbb931f31fea9885bb39fb366 100644 (file)
@@ -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;