From f89dcf93348b44b8ea2b57f940fcdaeae0f764f6 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Tue, 3 Nov 2020 11:56:05 +0100 Subject: [PATCH] Avoid recursion in tree-inline gcc/ChangeLog: 2020-11-03 Jan Hubicka 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 * gcc.c-torture/compile/pr97578.c: New test. --- gcc/ipa-inline-transform.c | 27 +++++++++++++++++++ gcc/testsuite/gcc.c-torture/compile/pr97578.c | 11 ++++++++ 2 files changed, 38 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr97578.c diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c index 4df1b7fb9ee..907a95cac5a 100644 --- a/gcc/ipa-inline-transform.c +++ b/gcc/ipa-inline-transform.c @@ -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 index 00000000000..e007724fdae --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr97578.c @@ -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); +} -- 2.30.2