diff options
| author | Marek Polacek <polacek@redhat.com> | 2014-01-22 22:15:12 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2014-01-22 22:15:12 +0000 |
| commit | f34f1c878f06ebbf4eee9dc2997570002174704c (patch) | |
| tree | f50ece7b1dc98d9b657dab87ab3eca6a8823f625 | |
| parent | 77b7a218bbe8aca5a7b4da211cbbc4ceb2dd6270 (diff) | |
| download | gcc-f34f1c878f06ebbf4eee9dc2997570002174704c.zip gcc-f34f1c878f06ebbf4eee9dc2997570002174704c.tar.gz gcc-f34f1c878f06ebbf4eee9dc2997570002174704c.tar.bz2 | |
re PR c/59891 (ICE on invalid code (with div-by-zero) at all optimization levels on x86_64-linux-gnu)
PR c/59891
c/
* c-typeck.c (build_conditional_expr): Call c_fully_fold instead
of remove_c_maybe_const_expr on op1 and op2.
testsuite/
* gcc.dg/torture/pr59891.c: New test.
From-SVN: r206944
| -rw-r--r-- | gcc/c/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr59891.c | 9 |
4 files changed, 24 insertions, 2 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 4754bdf..3ec4fe7 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2014-01-22 Marek Polacek <polacek@redhat.com> + + PR c/59891 + * c-typeck.c (build_conditional_expr): Call c_fully_fold instead + of remove_c_maybe_const_expr on op1 and op2. + 2014-01-15 Jakub Jelinek <jakub@redhat.com> PR c/58943 diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 09049e2..7cb717a 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -4708,8 +4708,10 @@ build_conditional_expr (location_t colon_loc, tree ifexp, bool ifexp_bcp, { if (int_operands) { - op1 = remove_c_maybe_const_expr (op1); - op2 = remove_c_maybe_const_expr (op2); + /* Use c_fully_fold here, since C_MAYBE_CONST_EXPR might be + nested inside of the expression. */ + op1 = c_fully_fold (op1, false, NULL); + op2 = c_fully_fold (op2, false, NULL); } ret = build3 (COND_EXPR, result_type, ifexp, op1, op2); if (int_operands) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6f26f7f..4cc8d9f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-01-22 Marek Polacek <polacek@redhat.com> + + PR c/59891 + * gcc.dg/torture/pr59891.c: New test. + 2014-01-22 Jeff Law <law@redhat.com> PR tree-optimization/59597 diff --git a/gcc/testsuite/gcc.dg/torture/pr59891.c b/gcc/testsuite/gcc.dg/torture/pr59891.c new file mode 100644 index 0000000..1562acc --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr59891.c @@ -0,0 +1,9 @@ +/* PR c/59891 */ + +unsigned int a; + +int +main () +{ + return (0 ? a : 0) ? : 0 % 0; /* { dg-warning "division by zero" } */ +} |