From c8cfe96e193f91077b97f2ca8605b83628a01448 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 16 Feb 2016 08:39:22 +0000 Subject: [PATCH] re PR tree-optimization/69801 (gcc ICE on valid code on x86_64-linux-gnu in "operand_equal_p") 2016-02-16 Richard Biener PR middle-end/69801 * fold-const.c (operand_equal_p): For COND_EXPR zero operand mask OEP_ADDRESS_OF. * gcc.dg/pr69801.c: New testcase. From-SVN: r233444 --- gcc/ChangeLog | 6 ++++++ gcc/fold-const.c | 5 +++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr69801.c | 7 +++++++ 4 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr69801.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb8d543a0b0..bb58d51c2e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-02-16 Richard Biener + + PR middle-end/69801 + * fold-const.c (operand_equal_p): For COND_EXPR zero operand + mask OEP_ADDRESS_OF. + 2016-02-16 Alan Modra PR target/68973 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index e34bc81eae8..4992f4bdfb8 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -3118,6 +3118,11 @@ 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)) + return 0; + flags &= ~OEP_ADDRESS_OF; + return OP_SAME (0); + case VEC_COND_EXPR: case DOT_PROD_EXPR: return OP_SAME (0) && OP_SAME (1) && OP_SAME (2); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 020ab2b4a03..9ce6eb83836 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-02-16 Richard Biener + + PR middle-end/69801 + * gcc.dg/pr69801.c: New testcase. + 2016-02-15 Jerry DeLisle PR libgfortran/69651 diff --git a/gcc/testsuite/gcc.dg/pr69801.c b/gcc/testsuite/gcc.dg/pr69801.c new file mode 100644 index 00000000000..474cf838d45 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr69801.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ + +struct { + char c[1]; +} b, c; +int d, e; +void fn1() { e ? (d ? b : c).c : (d ? b : c).c; } -- 2.30.2