]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
tree-optimization/109304 - properly handle instrumented aliases
authorRichard Biener <rguenther@suse.de>
Tue, 28 Mar 2023 08:06:12 +0000 (08:06 +0000)
committerMartin Liska <mliska@suse.cz>
Tue, 4 Apr 2023 07:01:21 +0000 (09:01 +0200)
When adjusting calls to reflect instrumentation we failed to handle
calls to aliases since they appear to have no body.  Instead resort
to symtab node availability.  The patch also avoids touching
internal function calls in a more obvious way (builtins might
have a body available).

profiledbootstrap & regtest running on x86_64-unknown-linux-gnu.

Honza - does this look OK?

PR tree-optimization/109304
* tree-profile.cc (tree_profiling): Use symtab node
availability to decide whether to skip adjusting calls.
Do not adjust calls to internal functions.

* gcc.dg/pr109304.c: New testcase.

gcc/testsuite/gcc.dg/pr109304.c [new file with mode: 0644]
gcc/tree-profile.cc

diff --git a/gcc/testsuite/gcc.dg/pr109304.c b/gcc/testsuite/gcc.dg/pr109304.c
new file mode 100644 (file)
index 0000000..d435b04
--- /dev/null
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-require-profiling "-fprofile-generate" } */
+/* { dg-require-effective-target fpic } */
+/* { dg-options "-O3 -fprofile-generate -fPIC -fno-semantic-interposition" } */
+
+int PyUnicode_FindChar_i;
+int PyUnicode_FindChar()
+{
+  while (PyUnicode_FindChar_i)
+    if (PyUnicode_FindChar())
+      break;
+}
index 6f9a43e4bd50fb2b4cf3669aa5e6731ae6ee14f9..da300d5f9e8d0a625fcbb24a9290b9c3063e4a53 100644 (file)
@@ -808,7 +808,7 @@ tree_profiling (void)
       {
        if (!gimple_has_body_p (node->decl)
            || !(!node->clone_of
-           || node->decl != node->clone_of->decl))
+                || node->decl != node->clone_of->decl))
          continue;
 
        /* Don't profile functions produced for builtin stuff.  */
@@ -842,12 +842,15 @@ tree_profiling (void)
            for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
              {
                gcall *call = dyn_cast <gcall *> (gsi_stmt (gsi));
-               if (!call)
+               if (!call || gimple_call_internal_p (call))
                  continue;
 
                /* We do not clear pure/const on decls without body.  */
                tree fndecl = gimple_call_fndecl (call);
-               if (fndecl && !gimple_has_body_p (fndecl))
+               cgraph_node *callee;
+               if (fndecl
+                   && (callee = cgraph_node::get (fndecl))
+                   && callee->get_availability (node) == AVAIL_NOT_AVAILABLE)
                  continue;
 
                /* Drop the const attribute from the call type (the pure