diff options
| author | Jason Merrill <jason@redhat.com> | 2016-03-24 13:59:58 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-03-24 13:59:58 -0400 |
| commit | 52228180f1e50cbb082c843b933dc87d573dbfe6 (patch) | |
| tree | 5f4e4afced43d7472eef24ae5fe96be0e9768f34 | |
| parent | 8f085166f8aa480bd623ae49d17ec06915b74495 (diff) | |
| download | gcc-52228180f1e50cbb082c843b933dc87d573dbfe6.zip gcc-52228180f1e50cbb082c843b933dc87d573dbfe6.tar.gz gcc-52228180f1e50cbb082c843b933dc87d573dbfe6.tar.bz2 | |
re PR c++/70323 (missing error on integer overflow in constexpr function result converted to bool)
PR c++/70323
* constexpr.c (cxx_eval_call_expression): Don't cache result if
*overflow_p.
From-SVN: r234463
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-70323a.C | 11 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dbef1b2..6512cc5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-03-24 Jason Merrill <jason@redhat.com> + + PR c++/70323 + * constexpr.c (cxx_eval_call_expression): Don't cache result if + *overflow_p. + 2016-03-24 Patrick Palka <ppalka@gcc.gnu.org> PR c++/62212 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 8427513..2d30a84 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1448,7 +1448,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, if (result == error_mark_node) *non_constant_p = true; - if (*non_constant_p) + if (*non_constant_p || *overflow_p) result = error_mark_node; else if (!result) result = void_node; diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-70323a.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-70323a.C new file mode 100644 index 0000000..d166787 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-70323a.C @@ -0,0 +1,11 @@ +// PR c++/70323 +// { dg-do compile { target c++11 } } +// { dg-options "-Wall" } + +constexpr int overflow_if_0 (int i) { return __INT_MAX__ + !i; } +constexpr int overflow_if_1 (int i) { return __INT_MAX__ + i; } + +constexpr bool i0_0 = overflow_if_0 (0); // { dg-error "overflow in constant expression" } +constexpr bool i0_1 = overflow_if_0 (1); +constexpr bool i1_0 = overflow_if_1 (0); +constexpr bool i1_1 = overflow_if_1 (1); // { dg-error "overflow in constant expression" } |