]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ipa: Treat static constructors and destructors as non-local (PR 115815)
authorMartin Jambor <mjambor@suse.cz>
Fri, 6 Sep 2024 12:12:53 +0000 (14:12 +0200)
committerMartin Jambor <jamborm@gcc.gnu.org>
Fri, 6 Sep 2024 12:15:43 +0000 (14:15 +0200)
In PR 115815, IPA-SRA thought it had control over all invocations of a
(recursive) static destructor but it did not see the implied
invocation which led to the original being left behind and the
clean-up code encountering uses of SSAs that definitely should have
been dead.

Fixed by teaching cgraph_node::can_be_local_p about static
constructors and destructors.  Similar test is missing in
cgraph_node::local_p so I added the check there as well.

gcc/ChangeLog:

2024-07-25  Martin Jambor  <mjambor@suse.cz>

PR ipa/115815
* cgraph.cc (cgraph_node_cannot_be_local_p_1): Also check
DECL_STATIC_CONSTRUCTOR and DECL_STATIC_DESTRUCTOR.
* ipa-visibility.cc (non_local_p): Likewise.
(cgraph_node::local_p): Delete extraneous line of tabs.

gcc/testsuite/ChangeLog:

2024-07-25  Martin Jambor  <mjambor@suse.cz>

PR ipa/115815
* gcc.dg/lto/pr115815_0.c: New test.

gcc/cgraph.cc
gcc/ipa-visibility.cc
gcc/testsuite/gcc.dg/lto/pr115815_0.c [new file with mode: 0644]

index 473d8410bc976b647914996a56534b2febe69eae..39a3adbc7c357da110f8413867dffe7952c3e5f2 100644 (file)
@@ -2434,7 +2434,9 @@ cgraph_node_cannot_be_local_p_1 (cgraph_node *node, void *)
                && !node->forced_by_abi
                && !node->used_from_object_file_p ()
                && !node->same_comdat_group)
-              || !node->externally_visible));
+              || !node->externally_visible)
+          && !DECL_STATIC_CONSTRUCTOR (node->decl)
+          && !DECL_STATIC_DESTRUCTOR (node->decl));
 }
 
 /* Return true if cgraph_node can be made local for API change.
index 501d3c304aa364226148aef342f645dfbf4d9afe..21f0c47f388e29b03058890c00d099e9df4c7548 100644 (file)
@@ -102,7 +102,9 @@ non_local_p (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
           && !node->externally_visible
           && !node->used_from_other_partition
           && !node->in_other_partition
-          && node->get_availability () >= AVAIL_AVAILABLE);
+          && node->get_availability () >= AVAIL_AVAILABLE
+          && !DECL_STATIC_CONSTRUCTOR (node->decl)
+          && !DECL_STATIC_DESTRUCTOR (node->decl));
 }
 
 /* Return true when function can be marked local.  */
@@ -116,7 +118,6 @@ cgraph_node::local_p (void)
      return n->callees->callee->local_p ();
    return !n->call_for_symbol_thunks_and_aliases (non_local_p,
                                                  NULL, true);
-                                       
 }
 
 /* A helper for comdat_can_be_unshared_p.  */
diff --git a/gcc/testsuite/gcc.dg/lto/pr115815_0.c b/gcc/testsuite/gcc.dg/lto/pr115815_0.c
new file mode 100644 (file)
index 0000000..d938ae4
--- /dev/null
@@ -0,0 +1,18 @@
+int a;
+volatile int v;
+volatile int w;
+
+int __attribute__((destructor))
+b() {
+  if (v)
+    return a + b();
+  v = 5;
+  return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+  w = 1;
+  return 0;
+}