re PR c++/57279 ([C++11] alias declaration fails to declare function types with cv...

	PR c++/57279
	* decl.c (grokdeclarator): Allow member function qualifiers in
	TYPENAME context.

From-SVN: r198975

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3609fa5e6753c3122f7164c594de460ee334cbdf..72ec0f0dba4d0f363cc4334b80adbd62effc16f1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-16  Jason Merrill  <jason@redhat.com>
+
+       PR c++/57279
+       * decl.c (grokdeclarator): Allow member function qualifiers in
+       TYPENAME context in C++11 mode.
+
 2013-05-16  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/56782 - Regression with empty pack expansions

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b16472f6000887d9a7f3df5dcbf5b578a6ce7b1f..a4f686a57671bd10a781f0c36991067811744efe 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10295,8 +10295,10 @@ grokdeclarator (const cp_declarator *declarator,
 
          if (ctype)
            type = build_memfn_type (type, ctype, memfn_quals, rqual);
-         /* Core issue #547: need to allow this in template type args.  */
-         else if (template_type_arg && TREE_CODE (type) == FUNCTION_TYPE)
+         /* Core issue #547: need to allow this in template type args.
+            Allow it in general in C++11 for alias-declarations.  */
+         else if ((template_type_arg || cxx_dialect >= cxx11)
+                  && TREE_CODE (type) == FUNCTION_TYPE)
            type = apply_memfn_quals (type, memfn_quals, rqual);
          else
            error ("invalid qualifiers on non-member function type");

diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-35.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-35.C
new file mode 100644 (file)
index 0000000..f412b30
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-35.C
@@ -0,0 +1,9 @@
+// PR c++/57279
+// { dg-require-effective-target c++11 }
+
+typedef void fc1() const; // OK
+typedef void frr1() &&; // OK
+typedef void fcr1() const &;
+using fc2 = void() const; // #4
+using frr2 = void() &&; // OK
+using fcr2 = void() const &; // #6