OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/51305 ([C++11][constexpr] noexcept-specifier overconstraints constexpr functions)

Browse Source 
/cp
2011-12-21  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51305
	* semantics.c (massage_constexpr_body): Reorder conditionals, make
	sure a BIND_EXPR embedded in a MUST_NOT_THROW_EXPR is handled.

/testsuite
2011-12-21  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51305
	* g++.dg/cpp0x/constexpr-noexcept6.C: New.

From-SVN: r182594
This commit is contained in:
Paolo Carlini 2011-12-21 16:28:08 +00:00 committed by Paolo Carlini
parent b0f96e350a
commit 65a6f60960
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2011-12-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51305
* semantics.c (massage_constexpr_body): Reorder conditionals, make
sure a BIND_EXPR embedded in a MUST_NOT_THROW_EXPR is handled.
2011-12-20 Paolo Carlini <paolo.carlini@oracle.com> 2011-12-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51621 PR c++/51621

4
gcc/cp/semantics.c
View File

@ -5998,12 +5998,12 @@ massage_constexpr_body (tree fun, tree body)
(DECL_CONTEXT (fun), body); (DECL_CONTEXT (fun), body);
else else
{ {
if (TREE_CODE (body) == BIND_EXPR)
body = BIND_EXPR_BODY (body);
if (TREE_CODE (body) == EH_SPEC_BLOCK) if (TREE_CODE (body) == EH_SPEC_BLOCK)
body = EH_SPEC_STMTS (body); body = EH_SPEC_STMTS (body);
if (TREE_CODE (body) == MUST_NOT_THROW_EXPR) if (TREE_CODE (body) == MUST_NOT_THROW_EXPR)
body = TREE_OPERAND (body, 0); body = TREE_OPERAND (body, 0);
if (TREE_CODE (body) == BIND_EXPR)
body = BIND_EXPR_BODY (body);
body = constexpr_fn_retval (body); body = constexpr_fn_retval (body);
} }
return body; return body;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-12-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51305
* g++.dg/cpp0x/constexpr-noexcept6.C: New.
2011-12-21 Jakub Jelinek <jakub@redhat.com> 2011-12-21 Jakub Jelinek <jakub@redhat.com>
PR middle-end/51644 PR middle-end/51644

10
gcc/testsuite/g++.dg/cpp0x/constexpr-noexcept6.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/51305
// { dg-options -std=c++0x }
constexpr bool ok() noexcept
{
typedef int type;
return true;
}
constexpr auto x = ok();