Avoid recursion in tree-inline
authorJan Hubicka <jh@suse.cz>
Tue, 3 Nov 2020 10:56:05 +0000 (11:56 +0100)
committerJan Hubicka <jh@suse.cz>
Tue, 3 Nov 2020 10:56:05 +0000 (11:56 +0100)
gcc/ChangeLog:

2020-11-03  Jan Hubicka  <hubicka@ucw.cz>

PR ipa/97578
* ipa-inline-transform.c (maybe_materialize_called_clones): New
function.
(inline_transform): Use it.

gcc/testsuite/ChangeLog:

2020-11-03  Jan Hubicka  <hubicka@ucw.cz>

* gcc.c-torture/compile/pr97578.c: New test.

gcc/ipa-inline-transform.c
gcc/testsuite/gcc.c-torture/compile/pr97578.c [new file with mode: 0644]

index 4df1b7fb9eebb447463607e2f4e26065c786d706..907a95cac5aa365b564be4aece5896d0eac322bb 100644 (file)
@@ -51,6 +51,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "ipa-modref-tree.h"
 #include "ipa-modref.h"
 #include "symtab-thunks.h"
+#include "symtab-clones.h"
 
 int ncalls_inlined;
 int nfunctions_inlined;
@@ -695,6 +696,31 @@ preserve_function_body_p (struct cgraph_node *node)
   return false;
 }
 
+/* tree-inline can not recurse; materialize all function bodie we will need
+   during inlining.  This includes inlined functions, but also called functions
+   with param manipulation because IPA param manipulation attaches debug
+   statements to PARM_DECLs of called clone.  Materialize them if needed.
+
+   FIXME: This is somehwat broken by design because it does not play well
+   with partitioning.  */
+
+static void
+maybe_materialize_called_clones (cgraph_node *node)
+{
+  for (cgraph_edge *e = node->callees; e; e = e->next_callee)
+    {
+      clone_info *info;
+
+      if (!e->inline_failed)
+       maybe_materialize_called_clones (e->callee);
+
+      cgraph_node *callee = cgraph_node::get (e->callee->decl);
+      if (callee->clone_of
+         && (info = clone_info::get (callee)) && info->param_adjustments)
+       callee->get_untransformed_body ();
+    }
+}
+
 /* Apply inline plan to function.  */
 
 unsigned int
@@ -748,6 +774,7 @@ inline_transform (struct cgraph_node *node)
       ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count;
     }
 
+  maybe_materialize_called_clones (node);
   for (e = node->callees; e; e = next)
     {
       if (!e->inline_failed)
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr97578.c b/gcc/testsuite/gcc.c-torture/compile/pr97578.c
new file mode 100644 (file)
index 0000000..e007724
--- /dev/null
@@ -0,0 +1,11 @@
+int printf (const char *, ...);
+
+int a;
+static void b(int c) {
+  if (c)
+    printf("%d", a);
+}
+void e() {
+  int d = 0;
+  b(d);
+}