aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ipa.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7ac8f0..b4f6417 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-08 Jan Hubicka <jh@suse.cz>
+
+ * ipa.c (walk_polymorphic_call_targets): Fix redirection before IPA
+ summary generation.
+
2013-09-08 Jeff Law <law@redhat.com>
PR bootstrap/58340
diff --git a/gcc/ipa.c b/gcc/ipa.c
index f52a77e..91d63eb 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -220,9 +220,9 @@ walk_polymorphic_call_targets (pointer_set_t *reachable_call_targets,
edge->caller->symbol.order,
cgraph_node_name (target), target->symbol.order);
edge = cgraph_make_edge_direct (edge, target);
- if (cgraph_state != CGRAPH_STATE_IPA_SSA)
+ if (!inline_summary_vec && edge->call_stmt)
cgraph_redirect_edge_call_stmt_to_callee (edge);
- else if (inline_summary_vec)
+ else
inline_update_overall_summary (node);
}
}