aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hubicka <jh@suse.cz>2013-08-26 17:23:48 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2013-08-26 15:23:48 +0000
commite8aec9755b36ed33a91ea8f16e8dfa97bf0cde87 (patch)
tree380bc225ca3201be6b3b42352412323c297d2267
parentd0b66480a9d5d2803997aa1d71e4e619381f8fea (diff)
downloadgcc-e8aec9755b36ed33a91ea8f16e8dfa97bf0cde87.zip
gcc-e8aec9755b36ed33a91ea8f16e8dfa97bf0cde87.tar.gz
gcc-e8aec9755b36ed33a91ea8f16e8dfa97bf0cde87.tar.bz2
ipa-inline-transform.c (inline_transform): Be ready for basic block to be changed by edge redirection.
* ipa-inline-transform.c (inline_transform): Be ready for basic block to be changed by edge redirection. From-SVN: r201997
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ipa-inline-transform.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d004d54..41d2b41 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2013-08-26 Jan Hubicka <jh@suse.cz>
+ * ipa-inline-transform.c (inline_transform): Be ready for basic block
+ to be changed by edge redirection.
+
+2013-08-26 Jan Hubicka <jh@suse.cz>
+
* cgraph.c (cgraph_speculative_call_info): Fix parameter order and formating;
add sanity check.
(cgraph_resolve_speculation): Add FIXME about scaling profiles.
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 8ead336..7f835ea 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -412,7 +412,7 @@ unsigned int
inline_transform (struct cgraph_node *node)
{
unsigned int todo = 0;
- struct cgraph_edge *e;
+ struct cgraph_edge *e, *next;
/* FIXME: Currently the pass manager is adding inline transform more than
once to some clones. This needs revisiting after WPA cleanups. */
@@ -424,8 +424,11 @@ inline_transform (struct cgraph_node *node)
if (preserve_function_body_p (node))
save_inline_function_body (node);
- for (e = node->callees; e; e = e->next_callee)
- cgraph_redirect_edge_call_stmt_to_callee (e);
+ for (e = node->callees; e; e = next)
+ {
+ next = e->next_callee;
+ cgraph_redirect_edge_call_stmt_to_callee (e);
+ }
ipa_remove_all_references (&node->symbol.ref_list);
timevar_push (TV_INTEGRATION);