OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR middle-end/40102 (Revision 147294 caused ICE: verify_cgraph_node)

Browse Source 
PR middle-end/40102
	* cgraph.c (cgraph_create_edge_including_clones): Also asume that the
	original node might've been modified.
	* tree-inline.c (copy_bb): Do not assume that all clones are the same.

	PR middle-end/40102
	* g++.dg/torture/pr40102.C: New testcase.

From-SVN: r148287
This commit is contained in:
Jan Hubicka 2009-06-08 19:17:52 +02:00 committed by Jan Hubicka
parent 491e6ad11c
commit 6ce2002b03
5 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2009-06-08 Jan Hubicka <jh@suse.cz>
PR middle-end/40102
* cgraph.c (cgraph_create_edge_including_clones): Also asume that the
original node might've been modified.
* tree-inline.c (copy_bb): Do not assume that all clones are the same.
2009-06-08 Jakub Jelinek <jakub@redhat.com>
* tree-object-size.c (addr_object_size): Add OSI argument.

5
gcc/cgraph.c
View File

@ -701,8 +701,9 @@ cgraph_create_edge_including_clones (struct cgraph_node *orig, struct cgraph_nod
{
struct cgraph_node *node;
cgraph_create_edge (orig, callee, stmt, count, freq, loop_depth)->inline_failed =
reason;
if (!cgraph_edge (orig, stmt))
cgraph_create_edge (orig, callee, stmt,
count, freq, loop_depth)->inline_failed = reason;
if (orig->clones)
for (node = orig->clones; node != orig;)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-06-08 Jan Hubicka <jh@suse.cz>
PR middle-end/40102
* g++.dg/torture/pr40102.C: New testcase.
2009-06-08 Jakub Jelinek <jakub@redhat.com>
* gcc.dg/builtin-object-size-2.c (test1): Adjust expected results.

41
gcc/testsuite/g++.dg/torture/pr40102.C Normal file
View File

@ -0,0 +1,41 @@
/* { dg-do compile } */
bool foo0(int) { return true; }
bool foo1();
struct A
{
A();
~A();
template<typename T> void bar1(T f)
{
if (f(0))
foo1();
}
template<typename T> void bar2(T);
};
template<typename T> void A::bar2(T f)
{
A a, b[1], *p;
while (foo1())
{
if (p)
++p;
if (p && foo1())
bar1(f);
if (p)
++p;
}
if (foo1())
bar1(f);
}
void baz()
{
A().bar2(foo0);
}

9
gcc/tree-inline.c
View File

@ -1508,11 +1508,14 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale,
gcc_unreachable ();
}
edge = cgraph_edge (id->src_node, orig_stmt);
/* Constant propagation on argument done during inlining
may create new direct call. Produce an edge for it. */
if (!edge && is_gimple_call (stmt)
&& (fn = gimple_call_fndecl (stmt)) != NULL
&& !cgraph_edge (id->dst_node, stmt))
if ((!edge
|| (edge->indirect_call
&& id->transform_call_graph_edges == CB_CGE_MOVE_CLONES))
&& is_gimple_call (stmt)
&& (fn = gimple_call_fndecl (stmt)) != NULL)
{
struct cgraph_node *dest = cgraph_node (fn);