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

re PR c++/58888 ([c++11] Rejects-valid: static member with auto and initializer)

Browse Source 
/cp
2013-10-29  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58888
	* decl2.c (grokfield): Handle auto like NSDMI.

/testsuite
2013-10-29  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58888
	* g++.dg/cpp0x/auto40.C: New.
	* g++.dg/other/warning1.C: Adjust.

From-SVN: r204164
This commit is contained in:
Paolo Carlini 2013-10-29 15:20:10 +00:00 committed by Paolo Carlini
parent 72a6cdded1
commit 5f546e16b7
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-29 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58888
* decl2.c (grokfield): Handle auto like NSDMI.
2013-10-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58878

20
gcc/cp/decl2.c
View File

@ -955,26 +955,6 @@ grokfield (const cp_declarator *declarator,
/* C++11 NSDMI, keep going. */;
else if (!VAR_P (value))
gcc_unreachable ();
else if (!processing_template_decl)
{
if (TREE_CODE (init) == CONSTRUCTOR)
init = digest_init (TREE_TYPE (value), init, tf_warning_or_error);
init = maybe_constant_init (init);
if (init != error_mark_node && !TREE_CONSTANT (init))
{
/* We can allow references to things that are effectively
static, since references are initialized with the
address. */
if (TREE_CODE (TREE_TYPE (value)) != REFERENCE_TYPE
|| (TREE_STATIC (init) == 0
&& (!DECL_P (init) || DECL_EXTERNAL (init) == 0)))
{
error ("field initializer is not constant");
init = error_mark_node;
}
}
}
}
if (processing_template_decl && VAR_OR_FUNCTION_DECL_P (value))

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-29 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58888
* g++.dg/cpp0x/auto40.C: New.
* g++.dg/other/warning1.C: Adjust.
2013-10-29 Richard Biener <rguenther@suse.de>
* gcc.dg/torture/restrict-2.c: New testcase.

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

@ -0,0 +1,11 @@
// PR c++/58888
// { dg-do compile { target c++11 } }
#include <initializer_list>
struct A
{
static constexpr auto b{1.0};
};
constexpr decltype(A::b) A::b;

4
gcc/testsuite/g++.dg/other/warning1.C
View File

@ -7,8 +7,8 @@ extern "C" int printf(const char *, ...);
struct S
{
static const float inf = 1.0f / 0.0f; // { dg-warning "1.0|float|initializ" }
static const float nan = 0.0f / 0.0f; // { dg-warning "0.0|float|initializ" }
static const float inf = 1.0f / 0.0f; // { dg-error "1.0|float|initializ" }
static const float nan = 0.0f / 0.0f; // { dg-error "0.0|float|initializ" }
};
int main()