re PR c++/46245 ([C++0x] rejects function with late-specified return type as a non...

	PR c++/46245
	* decl.c (grokdeclarator): Complain later for auto parameter.
	* pt.c (splice_late_return_type): Handle use in a template
	type-parameter.

From-SVN: r174227

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 72e62d75f70acff4dfc3ca90b13228f5ed5a34b4..d78f18324edd025a42ce41feca0c1bb9480b8125 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-25  Jason Merrill  <jason@redhat.com>
 
+       PR c++/46245
+       * decl.c (grokdeclarator): Complain later for auto parameter.
+       * pt.c (splice_late_return_type): Handle use in a template
+       type-parameter.
+
        PR c++/46696
        * typeck.c (cp_build_modify_expr): Check DECL_DEFAULTED_FN.
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d87a837293065aefe2ecafa8638453039f2c96d1..8000441d06f82c40f64fea9023d6bf4246a92404 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8741,12 +8741,6 @@ grokdeclarator (const cp_declarator *declarator,
               || thread_p)
        error ("storage class specifiers invalid in parameter declarations");
 
-      if (type_uses_auto (type))
-       {
-         error ("parameter declared %<auto%>");
-         type = error_mark_node;
-       }
-
       /* Function parameters cannot be constexpr.  If we saw one, moan
          and pretend it wasn't there.  */
       if (constexpr_p)
@@ -9727,6 +9721,12 @@ grokdeclarator (const cp_declarator *declarator,
       if (ctype || in_namespace)
        error ("cannot use %<::%> in parameter declaration");
 
+      if (type_uses_auto (type))
+       {
+         error ("parameter declared %<auto%>");
+         type = error_mark_node;
+       }
+
       /* A parameter declared as an array of T is really a pointer to T.
         One declared as a function is really a pointer to a function.
         One declared as a member is really a pointer to member.  */

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index bb4515be6b7f891774743e00408a22ff5598d382..c3c759e38aa660dbcd2c73fb1ff986c4ef1197c5 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19315,7 +19315,12 @@ splice_late_return_type (tree type, tree late_return_type)
     return type;
   argvec = make_tree_vec (1);
   TREE_VEC_ELT (argvec, 0) = late_return_type;
-  if (processing_template_decl)
+  if (processing_template_parmlist)
+    /* For a late-specified return type in a template type-parameter, we
+       need to add a dummy argument level for its parmlist.  */
+    argvec = add_to_template_args
+      (make_tree_vec (processing_template_parmlist), argvec);
+  if (current_template_parms)
     argvec = add_to_template_args (current_template_args (), argvec);
   return tsubst (type, argvec, tf_warning_or_error, NULL_TREE);
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 833d52eb63542ea03da2303a1d5a9130103bff3b..3cc818adc80731406d6872328463ac95dfdebb2d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-25  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/auto23.C: New.
+       * g++.dg/cpp0x/auto9.C: Adjust.
+
        * g++.dg/cpp0x/defaulted29.C: New.
 
        * g++.dg/cpp0x/initlist51.C: New.

diff --git a/gcc/testsuite/g++.dg/cpp0x/auto23.C b/gcc/testsuite/g++.dg/cpp0x/auto23.C
new file mode 100644 (file)
index 0000000..49b5a0e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/auto23.C
@@ -0,0 +1,4 @@
+// PR c++/46245
+// { dg-options -std=c++0x }
+
+template<auto f()->int> struct A { };

diff --git a/gcc/testsuite/g++.dg/cpp0x/auto9.C b/gcc/testsuite/g++.dg/cpp0x/auto9.C
index ab90be55844bb9a6342d3a6c5643e668a8132538..142ef904f2d7d74add48eb0b810e719b2eba2235 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/auto9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto9.C
@@ -79,10 +79,10 @@ enum struct D : auto * { FF = 0 };          // { dg-error "must be an integral type|decl
 void
 bar ()
 {
-  try { } catch (auto i) { }                   // { dg-error "invalid use of" }
-  try { } catch (auto) { }                     // { dg-error "invalid use of" }
-  try { } catch (auto *i) { }                  // { dg-error "invalid use of" }
-  try { } catch (auto *) { }                   // { dg-error "invalid use of" }
+  try { } catch (auto i) { }                   // { dg-error "parameter declared" }
+  try { } catch (auto) { }                     // { dg-error "parameter declared" }
+  try { } catch (auto *i) { }                  // { dg-error "parameter declared" }
+  try { } catch (auto *) { }                   // { dg-error "parameter declared" }
 }
 
 void