re PR c/79199 (ICE with -Wduplicated-branches)

	PR c/79199
	* fold-const.c (operand_equal_p) [COND_EXPR]: Use OP_SAME_WITH_NULL
	for the third operand.

	* c-c++-common/Wduplicated-branches-13.c: New test.

From-SVN: r244928

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f485bb37255d482e10ca3f6c29932399cd782f2e..eb0e70564150c03092d714a38433c6fdba94e815 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-26  Marek Polacek  <polacek@redhat.com>
+
+       PR c/79199
+       * fold-const.c (operand_equal_p) [COND_EXPR]: Use OP_SAME_WITH_NULL
+       for the third operand.
+
 2017-01-26  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/79236

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 5576d592988fdae47a1b77f64bce4cd3057489a9..a8bb8af45c3aedce5cfb98873e1e6548bf953d20 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3147,7 +3147,7 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags)
                                      TREE_OPERAND (arg1, 0), flags));
 
        case COND_EXPR:
-         if (! OP_SAME (1) || ! OP_SAME (2))
+         if (! OP_SAME (1) || ! OP_SAME_WITH_NULL (2))
            return 0;
          flags &= ~OEP_ADDRESS_OF;
          return OP_SAME (0);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a65a68e3f63931266537270199a758873be0661..6b5ecb417ddafed385a83dbb7f3b98ae98c0dd8b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-26  Marek Polacek  <polacek@redhat.com>
+
+       PR c/79199
+       * c-c++-common/Wduplicated-branches-13.c: New test.
+
 2017-01-26  David Sherwood  <david.sherwood@arm.com>
 
        PR middle-end/79212

diff --git a/gcc/testsuite/c-c++-common/Wduplicated-branches-13.c b/gcc/testsuite/c-c++-common/Wduplicated-branches-13.c
new file mode 100644 (file)
index 0000000..7aa5b37
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/Wduplicated-branches-13.c
@@ -0,0 +1,23 @@
+/* PR c/79199 */
+/* { dg-do compile } */
+/* { dg-options "-Wduplicated-branches" } */
+
+unsigned int a, b, c, d, e;
+void
+fn1 (void)
+{
+  if (0) /* { dg-warning "this condition has identical branches" } */
+    {
+      if (d > 4294967293)
+       (void) 5;
+      c = d;
+      b = e | a;
+    }
+  else
+    {
+      if (d > 4294967293)
+       (void) 5;
+      c = d;
+      b = e | a;
+    }
+}