* cgraph.c (cgraph_speculative_call_info): Fix parameter order and formating;

	add sanity check.
	(cgraph_resolve_speculation): Add FIXME about scaling profiles.
	(cgraph_redirect_edge_call_stmt_to_callee): Fix ICE in debug dump.
	* ipa-inline.c (heap_edge_removal_hook): Reset node growth cache.
	(resolve_noninline_speculation): Update callee keys, too.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201996 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 2 deletions

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index a9eb1ad75a6..2cdf87519c5 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1397,6 +1397,8 @@ add_new_edges_to_heap (fibheap_t heap, vec<cgraph_edge_p> new_edges)
 static void
 heap_edge_removal_hook (struct cgraph_edge *e, void *data)
 {
+  if (e->callee)
+    reset_node_growth_cache (e->callee);
   if (e->aux)
     {
       fibheap_delete_node ((fibheap_t)data, (fibnode_t)e->aux);
@@ -1467,12 +1469,12 @@ resolve_noninline_speculation (fibheap_t edge_heap, struct cgraph_edge *edge)
       bitmap updated_nodes = BITMAP_ALLOC (NULL);
 
       cgraph_resolve_speculation (edge, NULL);
-      reset_node_growth_cache (where);
       reset_edge_caches (where);
       inline_update_overall_summary (where);
       update_caller_keys (edge_heap, where,
 			  updated_nodes, NULL);
-      reset_node_growth_cache (where);
+      update_callee_keys (edge_heap, where,
+			  updated_nodes);
       BITMAP_FREE (updated_nodes);
     }
 }