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

re PR c++/47208 ([C++0x] ICE: in decl_constant_var_p, at cp/decl2.c:3563 with missing #include <initializer_list>) 

PR c++/47208

gcc/cp/

	PR c++/47208
	* pt.c (do_auto_deduction): Do not mention error_mark_node in
	diagnostics.
	* semantics.c (finish_id_expression): Do not pass erroneous decl
	to decl_constant_var_p.

gcc/testsuite/

	PR c++/47208
	* g++.dg/cpp0x/auto21.C: New test.

From-SVN: r170268
This commit is contained in:
Dodji Seketeli 2011-02-18 08:47:56 +00:00 committed by Dodji Seketeli
parent 5dcddcfeea
commit 7f7d4b122b
5 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2011-02-18 Dodji Seketeli <dodji@redhat.com>
PR c++/47208
* pt.c (do_auto_deduction): Do not mention error_mark_node in
diagnostics.
* semantics.c (finish_id_expression): Do not pass erroneous decl
to decl_constant_var_p.
2011-02-17 Jakub Jelinek <jakub@redhat.com>
PR c++/47783

6
gcc/cp/pt.c
View File

@ -18926,7 +18926,11 @@ do_auto_deduction (tree type, tree init, tree auto_node)
DEDUCE_CALL, LOOKUP_NORMAL);
if (val > 0)
{
error ("unable to deduce %qT from %qE", type, init);
if (type && type != error_mark_node)
/* If type is error_mark_node a diagnostic must have been
emitted by now. Also, having a mention to '<type error>'
in the diagnostic is not really useful to the user. */
error ("unable to deduce %qT from %qE", type, init);
return error_mark_node;
}

3
gcc/cp/semantics.c
View File

@ -3148,7 +3148,8 @@ finish_id_expression (tree id_expression,
/* Only certain kinds of names are allowed in constant
expression. Enumerators and template parameters have already
been handled above. */
if (integral_constant_expression_p
if (! error_operand_p (decl)
&& integral_constant_expression_p
&& ! decl_constant_var_p (decl)
&& ! builtin_valid_in_constant_expr_p (decl))
{

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-18 Dodji Seketeli <dodji@redhat.com>
PR c++/47208
* g++.dg/cpp0x/auto21.C: New test.
2011-02-17 Iain Sandoe <iains@gcc.gnu.org>
* objc.dg/special/unclaimed-category-1.h: Updated for

5
gcc/testsuite/g++.dg/cpp0x/auto21.C Normal file
View File

@ -0,0 +1,5 @@
// Origin PR c++/47208
// { dg-options "-std=c++0x" }
constexpr auto list = { }; // { dg-error "deducing from brace-enclosed initializer list requires #include <initializer_list>" }
static const int l = list.size();