FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/54207 ([C++0x] ICE in build_noexcept_spec when bool is #defined/typedef'd)

Browse source 
PR c++/54207
	* except.c (build_noexcept_spec): Avoid direct comparison
	with boolean_true_node or boolean_false_node, instead use
	operand_equal_p and/or INTEGER_CST check.
	* pt.c (tsubst_exception_specification): Likewise.
	* typeck2.c (merge_exception_specifiers): Likewise.

	* g++.dg/cpp0x/noexcept18.C: New test.

From-SVN: r194263
This commit is contained in:
Jakub Jelinek 2012-12-06 19:55:48 +01:00 • committed by Jakub Jelinek
parent 947f720f7d
commit 84fd832c03
6 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gcc/cp/ChangeLog
View file

@ -1,3 +1,12 @@
2012-12-06 Jakub Jelinek <jakub@redhat.com>
PR c++/54207
* except.c (build_noexcept_spec): Avoid direct comparison
with boolean_true_node or boolean_false_node, instead use
operand_equal_p and/or INTEGER_CST check.
* pt.c (tsubst_exception_specification): Likewise.
* typeck2.c (merge_exception_specifiers): Likewise.
2012-12-06 Marc Glisse <marc.glisse@inria.fr>
PR c++/55573

16
gcc/cp/except.c
View file

@ -1316,15 +1316,21 @@ build_noexcept_spec (tree expr, int complain)
LOOKUP_NORMAL);
expr = cxx_constant_value (expr);
}
if (expr == boolean_true_node)
return noexcept_true_spec;
else if (expr == boolean_false_node)
return noexcept_false_spec;
if (TREE_CODE (expr) == INTEGER_CST)
{
if (operand_equal_p (expr, boolean_true_node, 0))
return noexcept_true_spec;
else
{
gcc_checking_assert (operand_equal_p (expr, boolean_false_node, 0));
return noexcept_false_spec;
}
}
else if (expr == error_mark_node)
return error_mark_node;
else
{
gcc_assert (processing_template_decl || expr == error_mark_node
gcc_assert (processing_template_decl
|| TREE_CODE (expr) == DEFERRED_NOEXCEPT);
return build_tree_list (expr, NULL_TREE);
}

2
gcc/cp/pt.c
View file

@ -10844,7 +10844,7 @@ tsubst_exception_specification (tree fntype,
{
/* A noexcept-specifier. */
tree expr = TREE_PURPOSE (specs);
if (expr == boolean_true_node || expr == boolean_false_node)
if (TREE_CODE (expr) == INTEGER_CST)
new_specs = expr;
else if (defer_ok)
{

2
gcc/cp/typeck2.c
View file

@ -1871,7 +1871,7 @@ merge_exception_specifiers (tree list, tree add, tree fn)
/* If ADD is a deferred noexcept, we must have been called from
process_subob_fn. For implicitly declared functions, we build up
a list of functions to consider at instantiation time. */
if (noex == boolean_true_node)
if (operand_equal_p (noex, boolean_true_node, 0))
noex = NULL_TREE;
gcc_assert (fn && (!noex || is_overloaded_fn (noex)));
noex = build_overload (fn, noex);

5
gcc/testsuite/ChangeLog
View file

@ -1,10 +1,11 @@
2012-12-06 Jakub Jelinek <jakub@redhat.com>
PR c++/54207
* g++.dg/cpp0x/noexcept18.C: New test.
PR c++/55573
* g++.dg/cpp0x/constexpr-55573.C: New test.
2012-12-06 Jakub Jelinek <jakub@redhat.com>
PR c++/55137
* g++.dg/opt/pr55137.C: New test.
* gcc.c-torture/execute/pr55137.c: New test.

11
gcc/testsuite/g++.dg/cpp0x/noexcept18.C Normal file
View file

@ -0,0 +1,11 @@
// PR c++/54207
// { dg-do compile }
// { dg-options "-std=c++11" }
typedef bool B;
constexpr B foo () { return true; }
void
bar () noexcept (foo ())
{
}