diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d1f0188961..3d8e36f2ec3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-10  Jan Hubicka  <jh@suse.cz>
+
+	* tree-inline.c (setup_one_parameter): Do not propagate into abnormal
+	PHIs.
+
 2007-01-10  Sa Liu  <saliu@de.ibm.com>
 	    Ben Elliston  <bje@au.ibm.com>
 
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index b3fc03fda7b..1e9a244d155 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1339,7 +1339,8 @@ setup_one_parameter (copy_body_data *id, tree p, tree value, tree fn,
      represent multiple variables for purposes of debugging. */
   if (gimple_in_ssa_p (cfun) && rhs && def && is_gimple_reg (p)
       && (TREE_CODE (rhs) == SSA_NAME
-	  || is_gimple_min_invariant (rhs)))
+	  || is_gimple_min_invariant (rhs))
+      && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (def))
     {
       insert_decl_map (id, def, rhs);
       return;