diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13ac23956aa..277e34873aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-21  Jan Hubicka  <jh@suse.cz>
+
+	* ipa-prop.c (ipa_edge_removal_hook): Check for bounds.
+
 2010-04-21  Jan Hubicka  <jh@suse.cz>
 
 	* varpool.c (decide_is_variable_needed): Variable is always needed
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index ec9f63d89a7..af00175124d 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -1260,6 +1260,10 @@ ipa_edge_removal_hook (struct cgraph_edge *cs, void *data ATTRIBUTE_UNUSED)
 static void
 ipa_node_removal_hook (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
 {
+  /* During IPA-CP updating we can be called on not-yet analyze clones.  */
+  if (VEC_length (ipa_node_params_t, ipa_node_params_vector)
+      <= (unsigned)node->uid)
+    return;
   ipa_free_node_params_substructures (IPA_NODE_REF (node));
 }