From 3afeafbce4c5663040b68407e3a6d9b75ba694d0 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 19 Nov 2011 23:17:12 +0000 Subject: [PATCH] re PR c++/51216 (ICE with statement expression) /cp 2011-11-19 Paolo Carlini PR c++/51216 * semantics.c (potential_constant_expression_1): Handle IF_STMT, DO_STMT, FOR_STMT, and WHILE_STMT. /testsuite 2011-11-19 Paolo Carlini PR c++/51216 * g++.dg/cpp0x/pr51216.C: New. From-SVN: r181517 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/semantics.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/pr51216.C | 10 ++++++++++ 4 files changed, 25 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr51216.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fa8e1e2e203..3d0f356244c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-11-19 Paolo Carlini + + PR c++/51216 + * semantics.c (potential_constant_expression_1): Handle IF_STMT, + DO_STMT, FOR_STMT, and WHILE_STMT. + 2011-11-18 Fabien Chêne PR c++/51188 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index f70bdb377b5..fe685fa1527 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -8178,6 +8178,10 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags) case EXPR_STMT: case BIND_EXPR: case TRANSACTION_EXPR: + case IF_STMT: + case DO_STMT: + case FOR_STMT: + case WHILE_STMT: if (flags & tf_error) error ("expression %qE is not a constant-expression", t); return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5b579e0cd86..861f36c4c41 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-19 Paolo Carlini + + PR c++/51216 + * g++.dg/cpp0x/pr51216.C: New. + 2011-11-19 Eric Botcazou * gcc.dg/delay-slot-2.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51216.C b/gcc/testsuite/g++.dg/cpp0x/pr51216.C new file mode 100644 index 00000000000..4bdd071475e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr51216.C @@ -0,0 +1,10 @@ +// PR c++/51216 +// { dg-options "-std=c++0x" } + +void foo() +{ + int i = ({ if (1) ; }); // { dg-error "ignored" } + int j = ({ for (;;) ; }); // { dg-error "ignored" } + int k = ({ while (1) ; }); // { dg-error "ignored" } + int l = ({ do { } while (1); }); // { dg-error "ignored" } +} -- 2.30.2