From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 28 Apr 2016 22:23:01 +0000 (+0000)
Subject: 	PR middle-end/70843
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2087b56901dfd3a0ad3f4015b44ec3d323ed5e7;p=thirdparty%2Fgcc.git

	PR middle-end/70843
	* fold-const.c (operand_equal_p): Don't verify hash value equality
	if arg0 == arg1.
	* tree.c (inchash::add_expr): Handle STATEMENT_LIST.  Ignore BLOCK
	and OMP_CLAUSE.

	* gcc.dg/pr70843.c: New test.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a23ed86b912..400a65af02a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-04-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/70843
+	* fold-const.c (operand_equal_p): Don't verify hash value equality
+	if arg0 == arg1.
+	* tree.c (inchash::add_expr): Handle STATEMENT_LIST.  Ignore BLOCK
+	and OMP_CLAUSE.
+
 2016-04-28  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/70858
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 96d8484c1eb7..69749a85231e 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -2756,12 +2756,15 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags)
     {
       if (operand_equal_p (arg0, arg1, flags | OEP_NO_HASH_CHECK))
 	{
-	  inchash::hash hstate0 (0), hstate1 (0);
-	  inchash::add_expr (arg0, hstate0, flags);
-	  inchash::add_expr (arg1, hstate1, flags);
-	  hashval_t h0 = hstate0.end ();
-	  hashval_t h1 = hstate1.end ();
-	  gcc_assert (h0 == h1);
+	  if (arg0 != arg1)
+	    {
+	      inchash::hash hstate0 (0), hstate1 (0);
+	      inchash::add_expr (arg0, hstate0, flags);
+	      inchash::add_expr (arg1, hstate1, flags);
+	      hashval_t h0 = hstate0.end ();
+	      hashval_t h1 = hstate1.end ();
+	      gcc_assert (h0 == h1);
+	    }
 	  return 1;
 	}
       else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 595e3a8e0168..d9e1e03760ee 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/70843
+	* gcc.dg/pr70843.c: New test.
+
 2016-04-28  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/70858
diff --git a/gcc/testsuite/gcc.dg/pr70843.c b/gcc/testsuite/gcc.dg/pr70843.c
new file mode 100644
index 000000000000..c3c9212a0f5e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr70843.c
@@ -0,0 +1,9 @@
+/* PR middle-end/70843 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int
+foo (int x, int y)
+{
+  return ({ int a = 5; a += x; a *= y; a; }) ? : 2;
+}
diff --git a/gcc/tree.c b/gcc/tree.c
index 869218207b7d..8ec2d5c146c1 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7836,6 +7836,10 @@ add_expr (const_tree t, inchash::hash &hstate, unsigned int flags)
     case PLACEHOLDER_EXPR:
       /* The node itself doesn't matter.  */
       return;
+    case BLOCK:
+    case OMP_CLAUSE:
+      /* Ignore.  */
+      return;
     case TREE_LIST:
       /* A list of expressions, for a CALL_EXPR or as the elements of a
 	 VECTOR_CST.  */
@@ -7854,6 +7858,14 @@ add_expr (const_tree t, inchash::hash &hstate, unsigned int flags)
 	  }
 	return;
       }
+    case STATEMENT_LIST:
+      {
+	tree_stmt_iterator i;
+	for (i = tsi_start (CONST_CAST_TREE (t));
+	     !tsi_end_p (i); tsi_next (&i))
+	  inchash::add_expr (tsi_stmt (i), hstate, flags);
+	return;
+      }
     case FUNCTION_DECL:
       /* When referring to a built-in FUNCTION_DECL, use the __builtin__ form.
 	 Otherwise nodes that compare equal according to operand_equal_p might