From 9ddfe5f4202736b44f464ffabff0c3fb3f4b1d8b Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 6 Jul 2017 14:26:59 -0400
Subject: [PATCH] PR c++/81204 - parse error with dependent template-name

	PR c++/81204 - parse error with dependent template-name
	* parser.c (cp_parser_lookup_name): Revert previous change.

From-SVN: r250037
---
 gcc/cp/ChangeLog                              |  5 +++++
 gcc/cp/parser.c                               | 21 +++++----------------
 gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn2.C |  9 +++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn2.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2617fff1dc9..3af0c432718 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-06  Jason Merrill  <jason@redhat.com>
+
+	PR c++/81204 - parse error with dependent template-name
+	* parser.c (cp_parser_lookup_name): Revert previous change.
+
 2017-07-06  David Malcolm  <dmalcolm@redhat.com>
 
 	* cp-lang.c (LANG_HOOKS_RUN_LANG_SELFTESTS): Define as
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index dbe00527924..c81b1a1f5c1 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -25855,22 +25855,11 @@ cp_parser_lookup_name (cp_parser *parser, tree name,
 	decl = NULL_TREE;
 
       if (!decl)
-	{
-	  /* Look it up in the enclosing context.  */
-	  decl = lookup_name_real (name, prefer_type_arg (tag_type),
-				   /*nonclass=*/0,
-				   /*block_p=*/true, is_namespace, 0);
-	  /* DR 141 says when looking for a template-name after -> or ., only
-	     consider class templates.  */
-	  if (decl && is_template && !DECL_TYPE_TEMPLATE_P (decl))
-	    {
-	      tree d = decl;
-	      if (is_overloaded_fn (d))
-		d = get_first_fn (d);
-	      if (DECL_P (d) && !DECL_CLASS_SCOPE_P (d))
-		decl = NULL_TREE;
-	    }
-	}
+	/* Look it up in the enclosing context.  DR 141: When looking for a
+	   template-name after -> or ., only consider class templates.  */
+	decl = lookup_name_real (name, prefer_type_arg (tag_type, is_template),
+				 /*nonclass=*/0,
+				 /*block_p=*/true, is_namespace, 0);
       if (object_type == unknown_type_node)
 	/* The object is type-dependent, so we can't look anything up; we used
 	   this to get the DR 141 behavior.  */
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn2.C
new file mode 100644
index 00000000000..4a02ab22990
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-mem_fn2.C
@@ -0,0 +1,9 @@
+// { dg-do compile { target c++11 } }
+
+template <class A0, class... As> struct tuple 
+{
+  tuple<As...> tail;
+  template <int Offset, class... More> int apply(const More&... more) {
+    return tail.apply<1>(more...); // { dg-error "" } needs .template
+  }
+};
-- 
2.11.4.GIT