]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
sra: Disqualify bases of operands of asm gotos
authorMartin Jambor <mjambor@suse.cz>
Thu, 18 Jan 2024 13:24:15 +0000 (14:24 +0100)
committerMartin Jambor <mjambor@suse.cz>
Thu, 18 Jan 2024 13:25:30 +0000 (14:25 +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.

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 6a1141b737709fd76bbb0f515d3d14b56a23e07d..f8e71ec48b9372d827f9209d111f5498c5072674 100644 (file)
@@ -1559,15 +1559,32 @@ scan_function (void)
            case GIMPLE_ASM:
              {
                gasm *asm_stmt = as_a <gasm *> (stmt);
-               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;