From ba3307c092fce730120657ab5c89ff4d0936244e Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Wed, 10 Apr 2002 09:40:18 +0000
Subject: [PATCH] re PR c++/5507 (Overzealous implicit typename warning)

cp:
        PR c++/5507
        * decl.c (make_typename_type): Remove implicit typenameness.
testsuite:
        PR c++/5507
        * g++.dg/template/typename2.C: New test.

From-SVN: r52124
---
 gcc/cp/ChangeLog                          |  5 +++++
 gcc/cp/decl.c                             | 11 ++++++++++
 gcc/testsuite/ChangeLog                   |  5 +++++
 gcc/testsuite/g++.dg/template/typename2.C | 25 +++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/typename2.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1f30899d935..a2d8b8f3943 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/5507
+	* decl.c (make_typename_type): Remove implicit typenameness.
+
 2002-04-09  Jason Merrill  <jason@redhat.com>
 
 	PR optimization/6189
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 383991f0924..dc9d37313e7 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5699,6 +5699,17 @@ make_typename_type (context, name, complain)
 	    {
 	      if (DECL_ARTIFICIAL (t) || !(complain & tf_keep_type_decl))
 		t = TREE_TYPE (t);
+	      if (IMPLICIT_TYPENAME_P (t))
+		{
+		  /* Lookup found an implicit typename that we had
+		     injected into the current scope. Doing things
+		     properly would have located the exact same type,
+		     so there is no error here.  We must remove the
+		     implicitness so that we do not warn about it.  */
+		  t = copy_node (t);
+		  TREE_TYPE (t) = NULL_TREE;
+		}
+	      
 	      return t;
 	    }
 	}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fae1c9bdd05..5e82ca50d4b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/5507
+	* g++.dg/template/typename2.C: New test.
+
 2002-04-10  Alan Modra  <amodra@bigpond.net.au>
 
 	* gcc.c-torture/execute/loop-12.c: New.
diff --git a/gcc/testsuite/g++.dg/template/typename2.C b/gcc/testsuite/g++.dg/template/typename2.C
new file mode 100644
index 00000000000..4a4e40fd6ce
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/typename2.C
@@ -0,0 +1,25 @@
+// { dg-do compile }
+// { dg-options "" }
+
+// Copyright (C) 2001 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 21 Mar 2002 <nathan@codesourcery.com>
+
+// PR 5507. Overzealous implicit typename warning
+
+template<typename _CharT>
+class __ctype_abstract_base
+{
+  typedef int mask;
+};
+
+template<typename _CharT>
+class ctype : public __ctype_abstract_base<_CharT>
+{
+  typedef typename ctype::mask mask;
+};
+
+template<typename _CharT>
+class ctype2 : public __ctype_abstract_base<_CharT>
+{
+  typedef mask mask; // { dg-warning "(`typename )|(implicit typename)" "" }
+};
-- 
2.30.2