From c96cab6e77de25e1f15b3d8c33cd22a789bc7c4f Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 30 Oct 2012 12:02:39 +0000
Subject: [PATCH] re PR tree-optimization/55111 (ICE: tree check: expected
 ssa_name, have integer_cst in live_on_edge, at tree-vrp.c:89)

2012-10-30  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/55111
	* tree-ssa-pre.c (eliminate_insert): Properly fold the built
	stmt.

	* gcc.dg/torture/pr55111.c: New testcase.

From-SVN: r192984
---
 gcc/ChangeLog                          |  6 ++++++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gcc.dg/torture/pr55111.c | 24 ++++++++++++++++++++++++
 gcc/tree-ssa-pre.c                     |  4 ++--
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/pr55111.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 137e6a3b373..6cfacde346f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-30  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/55111
+	* tree-ssa-pre.c (eliminate_insert): Properly fold the built
+	stmt.
+
 2012-10-30  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/54963
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7acc07a7533..87520a3dd40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-30  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/55111
+	* gcc.dg/torture/pr55111.c: New testcase.
+
 2012-10-30  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/54988
diff --git a/gcc/testsuite/gcc.dg/torture/pr55111.c b/gcc/testsuite/gcc.dg/torture/pr55111.c
new file mode 100644
index 00000000000..f5b0692c8e0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr55111.c
@@ -0,0 +1,24 @@
+/* { dg-do compile } */
+
+int a, b, c;
+long d;
+unsigned long *e;
+
+int f(void)
+{
+  for(;; a++)
+    {
+      if(c)
+	{
+	  for(b = d = 0; b < 1; b++)
+	    e = &d;
+
+	  --*e;
+
+	  if(d > 0)
+	    a = 0;
+
+	  return d;
+	}
+    }
+}
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 7f9ab8bfb6c..13b3433bb04 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -3996,8 +3996,8 @@ eliminate_insert (gimple_stmt_iterator *gsi, tree val)
 
   tree res = make_temp_ssa_name (TREE_TYPE (val), NULL, "pretmp");
   gimple tem = gimple_build_assign (res,
-				    build1 (TREE_CODE (expr),
-					    TREE_TYPE (expr), leader));
+				    fold_build1 (TREE_CODE (expr),
+						 TREE_TYPE (expr), leader));
   gsi_insert_before (gsi, tem, GSI_SAME_STMT);
   VN_INFO_GET (res)->valnum = val;