diff options
| author | Marek Polacek <polacek@redhat.com> | 2017-02-15 16:14:19 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2017-02-15 16:14:19 +0000 |
| commit | c7545f1cb335004bed97202238f03e1d73832670 (patch) | |
| tree | e02ca76bb1063d3417cf2886eb53530f447a7d7c | |
| parent | 1114b39cdfd62e7dd4d61b6acb5b70ffcc4ed910 (diff) | |
| download | gcc-c7545f1cb335004bed97202238f03e1d73832670.zip gcc-c7545f1cb335004bed97202238f03e1d73832670.tar.gz gcc-c7545f1cb335004bed97202238f03e1d73832670.tar.bz2 | |
re PR c/79515 (ICE: tree check: expected class 'type', have 'exceptional' (error_mark) in do_warn_double_promotion, at c-family/c-warn.c:1867)
PR c/79515
* c-warn.c (do_warn_double_promotion): Don't warn if an invalid
conversion has occured.
* gcc.dg/dfp/pr79515.c: New.
From-SVN: r245485
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-warn.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/dfp/pr79515.c | 13 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index c9fe802..6256c4d 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2017-02-15 Marek Polacek <polacek@redhat.com> + + PR c/79515 + * c-warn.c (do_warn_double_promotion): Don't warn if an invalid + conversion has occured. + 2017-01-24 David Malcolm <dmalcolm@redhat.com> * c-common.c (c_common_reswords): Add "__RTL". diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c index 3c9077c..09c5760 100644 --- a/gcc/c-family/c-warn.c +++ b/gcc/c-family/c-warn.c @@ -1864,6 +1864,9 @@ do_warn_double_promotion (tree result_type, tree type1, tree type2, warn about it. */ if (c_inhibit_evaluation_warnings) return; + /* If an invalid conversion has occured, don't warn. */ + if (result_type == error_mark_node) + return; if (TYPE_MAIN_VARIANT (result_type) != double_type_node && TYPE_MAIN_VARIANT (result_type) != complex_double_type_node) return; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fe3a304..d95221a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-15 Marek Polacek <polacek@redhat.com> + + PR c/79515 + * gcc.dg/dfp/pr79515.c: New. + 2017-02-15 David Edelsohn <dje.gcc@gmail.com> * g++.dg/cpp0x/pr79296.C: Move dg-do compile directive first. diff --git a/gcc/testsuite/gcc.dg/dfp/pr79515.c b/gcc/testsuite/gcc.dg/dfp/pr79515.c new file mode 100644 index 0000000..6f6f09c --- /dev/null +++ b/gcc/testsuite/gcc.dg/dfp/pr79515.c @@ -0,0 +1,13 @@ +/* PR c/79515 */ +/* { dg-do compile } */ +/* { dg-options "-Wdouble-promotion" } */ + +extern _Decimal64 x; +extern int i; + +void +foo (void) +{ + if (x <= 2.0) /* { dg-error "mix operands" } */ + i++; +} |