mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-13 22:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid recursion in tree-inline

Browse Source 
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.
This commit is contained in:
Jan Hubicka 2020-11-03 11:56:05 +01:00
parent 8414529156
commit f89dcf9334
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gcc/ipa-inline-transform.c
View File

@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-modref-tree.h" #include "ipa-modref-tree.h"
#include "ipa-modref.h" #include "ipa-modref.h"
#include "symtab-thunks.h" #include "symtab-thunks.h"
#include "symtab-clones.h"
int ncalls_inlined; int ncalls_inlined;
int nfunctions_inlined; int nfunctions_inlined;
@ -695,6 +696,31 @@ preserve_function_body_p (struct cgraph_node *node)
return false; 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. */ /* Apply inline plan to function. */
unsigned int unsigned int
@ -748,6 +774,7 @@ inline_transform (struct cgraph_node *node)
ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count; ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count;
} }
maybe_materialize_called_clones (node);
for (e = node->callees; e; e = next) for (e = node->callees; e; e = next)
{ {
if (!e->inline_failed) if (!e->inline_failed)

11
gcc/testsuite/gcc.c-torture/compile/pr97578.c Normal file
View File

@ -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);
}