diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 427ceeaf1d837e4598f4129b21cad5dad9feaa32..e4f6bab3a76cca455459f87546004781b4318d4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-30  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-inline-analysis.c (estimate_function_body_sizes): Do not
+	free node params when called late with early=true.
+
 2014-12-30  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.c (ix86_legitimize_address): Use std::swap.
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 5cc0a2500ee57ec0b22fdffb24e051687d55c657..5f022c630d06da22c589e97d765071b195ebfe39 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -2851,7 +2851,7 @@ estimate_function_body_sizes (struct cgraph_node *node, bool early)
     {
       if (!early)
         loop_optimizer_finalize ();
-      else
+      else if (!ipa_edge_args_vector)
 	ipa_free_all_node_params ();
       free_dominance_info (CDI_DOMINATORS);
     }