DR 1688 PR c++/65327

	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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 259ce9c9839bd072dfeae913c0e1ef1d4edf7974..b4fff5085e886c7f2db7eafc35905b59dec04ce2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index e35e48436dc0a6016c41d922ad76c7e172c76983..cb0f11f5749f03d77d7ee27fcd06f1895b06972c 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -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;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a236581d4d68a3b7b941fd73a0fa2c5c4575d047..9e10e2d94afa127dc99d8ca25c5507a9a54ce7db 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -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

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
index 41afbe969a2b67f609d8002da1ce6add9e863a68..da9e3e4ab3f1a1b0e9c42923067319802a74676e 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-object1.C
@@ -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

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr65327.C b/gcc/testsuite/g++.dg/cpp0x/pr65327.C
new file mode 100644 (file)
index 0000000..c6cefab
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr65327.C
@@ -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;
+}