]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
tree-sra: Avoid SRAing arguments to a function returning_twice (PR 117142)
authorMartin Jambor <mjambor@suse.cz>
Fri, 15 Nov 2024 13:37:06 +0000 (14:37 +0100)
committerMartin Jambor <jamborm@gcc.gnu.org>
Wed, 27 Nov 2024 16:29:10 +0000 (17:29 +0100)
This is a manual bacport of commit
29d8f1f0b7ad3c69b3bdb130325300d5f73aa784 which must be done slightly
elsewhere for gcc 13 and 12 because function
build_access_from_call_arg was added only in gcc 14.

But the gist of the patch is the same.  The commit message of the
original fix says:

PR 117142 shows that the current SRA probably never worked reliably
with arguments passed to a function returning twice, because it then
creates statements before the call which however needs to be at the
beginning of a basic block.

While it should be possible to make at least the case of passing
arguments by value work with SRA (the statements would need to be put
just on the non-abnormal edges leading to the BB), this would mean
large surgery of function sra_modify_expr and I guess the time would
better be spent re-organizing the whole pass.

gcc/ChangeLog:

2024-11-14  Martin Jambor  <mjambor@suse.cz>

PR tree-optimization/117142
* tree-sra.cc (scan_function): Disqualify any candidate passed to
a function returning twice.

gcc/testsuite/ChangeLog:

2024-11-14  Martin Jambor  <mjambor@suse.cz>

* gcc.dg/tree-ssa/pr117142.c: New test.

(cherry picked from commit 6244de432a5ba9807c6f0065e70a8025af7b1bd6)

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

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr117142.c b/gcc/testsuite/gcc.dg/tree-ssa/pr117142.c
new file mode 100644 (file)
index 0000000..fc62c1e
--- /dev/null
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O1" } */
+
+struct a {
+  int b;
+};
+void c(int, int);
+void __attribute__((returns_twice))
+bar1(struct a);
+void bar(struct a) {
+  struct a d;
+  bar1(d);
+  c(d.b, d.b);
+}
index 47eee5add126a56e24bab56b95e5a5973356783b..5a9eaf31b6e92f0182cdef566435b84179bc6529 100644 (file)
@@ -1392,9 +1392,16 @@ scan_function (void)
              break;
 
            case GIMPLE_CALL:
-             for (i = 0; i < gimple_call_num_args (stmt); i++)
-               ret |= build_access_from_expr (gimple_call_arg (stmt, i),
-                                              stmt, false);
+             if (gimple_call_flags (stmt) & ECF_RETURNS_TWICE)
+               {
+                 for (i = 0; i < gimple_call_num_args (stmt); i++)
+                   disqualify_base_of_expr (gimple_call_arg (stmt, i),
+                                            "Passed to a returns_twice call.");
+               }
+             else
+               for (i = 0; i < gimple_call_num_args (stmt); i++)
+                 ret |= build_access_from_expr (gimple_call_arg (stmt, i),
+                                                stmt, false);
 
              t = gimple_call_lhs (stmt);
              if (t && !disqualify_if_bad_bb_terminating_stmt (stmt, t, NULL))