From 016895178d73bf9e4b0dea6ed253adea4f9af4f9 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 24 Feb 2014 13:47:20 -0500
Subject: [PATCH] re PR c++/60312 ([c++1y] ICE using auto as template
 parameter)

	PR c++/60312
	* parser.c (cp_parser_template_type_arg): Check for invalid 'auto'.

From-SVN: r208092
---
 gcc/cp/ChangeLog                       |  5 +++++
 gcc/cp/parser.c                        |  5 +++++
 gcc/testsuite/g++.dg/cpp1y/auto-neg1.C | 16 ++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp1y/auto-neg1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1b204dc..5369ee6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-24  Jason Merrill  <jason@redhat.com>
+
+	PR c++/60312
+	* parser.c (cp_parser_template_type_arg): Check for invalid 'auto'.
+
 2014-02-21  Jason Merrill  <jason@redhat.com>
 
 	PR c++/58170
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 1e98032..d99dff0 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -18005,6 +18005,11 @@ static tree cp_parser_template_type_arg (cp_parser *parser)
     = G_("types may not be defined in template arguments");
   r = cp_parser_type_id_1 (parser, true, false);
   parser->type_definition_forbidden_message = saved_message;
+  if (cxx_dialect >= cxx1y && type_uses_auto (r))
+    {
+      error ("invalid use of %<auto%> in template argument");
+      r = error_mark_node;
+    }
   return r;
 }
 
diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-neg1.C b/gcc/testsuite/g++.dg/cpp1y/auto-neg1.C
new file mode 100644
index 0000000..1bc3995
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/auto-neg1.C
@@ -0,0 +1,16 @@
+// PR c++/60312
+// { dg-options -std=c++1y }
+
+template<typename> struct A;
+
+template<> struct A<auto>	// { dg-error "auto|template argument" }
+{
+  template<int> void foo();
+};
+
+void bar()
+{
+  A<auto>().foo<0>();		// { dg-error "auto|template argument" }
+}
+
+// { dg-prune-output "expected" }
-- 
2.7.4