mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-03 11:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

DR 1688 PR c++/65327

Browse Source 
DR 1688
	PR c++/65327
	* decl.c (grokdeclarator): Allow volatile and constexpr together.

	* g++.dg/cpp0x/constexpr-object1.C: Change dg-error to dg-bogus.
	* g++.dg/cpp0x/pr65327.C: New test.

From-SVN: r221463
This commit is contained in:
Marek Polacek 2015-03-16 18:30:49 +00:00 committed by Marek Polacek
parent de6d359336
commit ec638c5590
5 changed files with 35 additions and 3 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 @@
2015-03-16 Marek Polacek <polacek@redhat.com>
DR 1688
PR c++/65327
* decl.c (grokdeclarator): Allow volatile and constexpr together.
2015-03-12 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/65323

5
gcc/cp/decl.c
View File

@ -10134,8 +10134,9 @@ grokdeclarator (const cp_declarator *declarator,
the object as `const'. */
if (constexpr_p && innermost_code != cdk_function)
{
if (type_quals & TYPE_QUAL_VOLATILE)
error ("both %<volatile%> and %<constexpr%> cannot be used here");
/* DR1688 says that a `constexpr' specifier in combination with
`volatile' is valid. */
if (TREE_CODE (type) != REFERENCE_TYPE)
{
type_quals |= TYPE_QUAL_CONST;

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2015-03-16 Marek Polacek <polacek@redhat.com>
DR 1688
PR c++/65327
* g++.dg/cpp0x/constexpr-object1.C: Change dg-error to dg-bogus.
* g++.dg/cpp0x/pr65327.C: New test.
2015-03-16 Max Ostapenko <m.ostapenko@partner.samsung.com>
PR sanitizer/64820

2
gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
View File

@ -19,7 +19,7 @@ constexpr A1 a2; // { dg-error "uninitialized const" }
const constexpr A1 a3 = A1();
volatile constexpr A1 a4 = A1(); // { dg-error "both .volatile. and .constexpr. cannot" }
volatile constexpr A1 a4 = A1(); // { dg-bogus "both .volatile. and .constexpr. cannot" }
// error: on type declaration
constexpr struct pixel

18
gcc/testsuite/g++.dg/cpp0x/pr65327.C Normal file
View File

@ -0,0 +1,18 @@
// PR c++/65327
// { dg-do compile { target c++11 } }
// DR1688 says that constexpr can be used together with volatile.
constexpr volatile int i = 10;
void
foo ()
{
constexpr volatile int j = 5;
static constexpr volatile int k = 5;
}
constexpr volatile int
bar ()
{
return i;
}