aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/compare-elim.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr82913.c23
4 files changed, 36 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c6f948..f2de914 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/82913
+ * compare-elim.c (try_merge_compare): Punt if def_insn is not
+ single set.
+
2017-11-09 Jeff Law <law@redhat.com>
* vr-values.h: New file with vr_values class.
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index 17d0884..b34a07f 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -683,6 +683,8 @@ try_merge_compare (struct comparison *cmp)
rtx_insn *def_insn = cmp->in_a_setter;
rtx set = single_set (def_insn);
+ if (!set)
+ return false;
if (!can_merge_compare_into_arith (cmp_insn, def_insn))
return false;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 17fa766..f50bee7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/82913
+ * gcc.c-torture/compile/pr82913.c: New test.
+
2017-11-09 Paul Thomas <pault@gcc.gnu.org>
PR fortran/78619
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82913.c b/gcc/testsuite/gcc.c-torture/compile/pr82913.c
new file mode 100644
index 0000000..5cf5557
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr82913.c
@@ -0,0 +1,23 @@
+/* PR rtl-optimization/82913 */
+
+unsigned int a;
+unsigned long int b;
+
+int
+foo (void)
+{
+ ++a;
+ b = 0;
+}
+
+unsigned long int
+bar (int x)
+{
+ if (!foo () || !a)
+ {
+ int c = a != b;
+ if (c != x)
+ return a;
+ }
+ return 0;
+}