diff options
| author | Jason Merrill <jason@redhat.com> | 2015-01-12 09:15:07 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-01-12 09:15:07 -0500 |
| commit | 49c8bc0c77ee47f604c1e1ebe41cd9170fd33f48 (patch) | |
| tree | 3e6c9170b9c3b584b53f03d838e4ff08e2a0253e /gcc | |
| parent | 9a4fbc59086660c0348e7f233fed2a4ce7694235 (diff) | |
| download | gcc-49c8bc0c77ee47f604c1e1ebe41cd9170fd33f48.zip gcc-49c8bc0c77ee47f604c1e1ebe41cd9170fd33f48.tar.gz gcc-49c8bc0c77ee47f604c1e1ebe41cd9170fd33f48.tar.bz2 | |
re PR c++/64547 (A non-const constexpr function is rejected incorrectly)
PR c++/64547
* constexpr.c (cxx_eval_call_expression): A call to a void
function doesn't need to return a value.
From-SVN: r219466
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/constexpr-void2.C | 21 |
3 files changed, 29 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f60141d..14e1fb3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-12 Jason Merrill <jason@redhat.com> + + PR c++/64547 + * constexpr.c (cxx_eval_call_expression): A call to a void + function doesn't need to return a value. + 2015-01-09 Michael Collison <michael.collison@linaro.org> * call.c: Include hash-set.h, machmode.h, vec.h, double-int.h, diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 9a0d518..650250b 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1386,6 +1386,8 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, value by evaluating *this, but we don't bother; there's no need to put such a call in the hash table. */ result = lval ? ctx->object : ctx->ctor; + else if (VOID_TYPE_P (TREE_TYPE (res))) + result = void_node; else { result = *ctx->values->get (slot ? slot : res); diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-void2.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-void2.C new file mode 100644 index 0000000..321a35e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-void2.C @@ -0,0 +1,21 @@ +// PR c++/64547 +// { dg-do compile { target c++14 } } + +struct X +{ + int x; + constexpr int get() const {return x;} + constexpr void set(int foo) {x = foo;} +}; + +constexpr int bar() +{ + X x{42}; + x.set(666); + return x.get(); +} + +int main() +{ + constexpr int foo = bar(); +} |