diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-03-06 16:43:51 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-03-06 16:43:51 +0100 |
| commit | 345edb3701a0e99d10a532736f27675846ca5dec (patch) | |
| tree | 1355c38d33b486b38764e67d763dc2e6de156709 /gcc | |
| parent | 90d9a8e6ef72bd85839fb092605aa6d945616178 (diff) | |
| download | gcc-345edb3701a0e99d10a532736f27675846ca5dec.zip gcc-345edb3701a0e99d10a532736f27675846ca5dec.tar.gz gcc-345edb3701a0e99d10a532736f27675846ca5dec.tar.bz2 | |
re PR c++/79822 (ICE with void statement expression)
PR c++/79822
* constexpr.c (cxx_eval_statement_list): Treat empty ({ }) like
({ (void) 0; }).
* g++.dg/cpp0x/constexpr-79822.C: New test.
From-SVN: r245925
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-79822.C | 12 |
4 files changed, 26 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fc9757b..12d74a6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-03-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/79822 + * constexpr.c (cxx_eval_statement_list): Treat empty ({ }) like + ({ (void) 0; }). + 2017-03-06 Jason Merrill <jason@redhat.com> Revert "Allow deduction guides to look into primary template." diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 8148957..f114da0 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3725,8 +3725,9 @@ cxx_eval_statement_list (const constexpr_ctx *ctx, tree t, { tree_stmt_iterator i; tree local_target; - /* In a statement-expression we want to return the last value. */ - tree r = NULL_TREE; + /* In a statement-expression we want to return the last value. + For empty statement expression return void_node. */ + tree r = void_node; if (!jump_target) { local_target = NULL_TREE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 35eb818..23adcd1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-03-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/79822 + * g++.dg/cpp0x/constexpr-79822.C: New test. + 2017-03-06 Richard Biener <rguenther@suse.de> PR tree-optimization/79894 diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-79822.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-79822.C new file mode 100644 index 0000000..6a72702 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-79822.C @@ -0,0 +1,12 @@ +// PR c++/79822 +// { dg-do compile } +// { dg-options "" } + +bool +foo () +{ + bool a = ({ }) && false; // { dg-error "could not convert" } + bool b = ({ ; }) && false; // { dg-error "could not convert" } + bool c = ({ (void) 1; }) && false; // { dg-error "could not convert" } + return a && b && c; +} |