From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 086C8384A00F; Fri, 21 May 2021 14:50:54 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 086C8384A00F
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r9-9548] c++: base template friend [PR52625]
X-Act-Checkin: gcc
X-Git-Author: Jason Merrill <jason@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-9
X-Git-Oldrev: 0c6b4e661d875410535e17a9d82e6a0d09f28c65
X-Git-Newrev: 5b4cb06374890f2a190c9a989b569a9a15388445
Message-Id: <20210521145054.086C8384A00F@sourceware.org>
Date: Fri, 21 May 2021 14:50:54 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 21 May 2021 14:50:54 -0000

https://gcc.gnu.org/g:5b4cb06374890f2a190c9a989b569a9a15388445

commit r9-9548-g5b4cb06374890f2a190c9a989b569a9a15388445
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Apr 7 15:38:07 2021 -0400

    c++: base template friend [PR52625]
    
    Here we were mistakenly treating the injected-class-name as a partial
    specialization.
    
    gcc/cp/ChangeLog:
    
            PR c++/52625
            * pt.c (maybe_process_partial_specialization): Check
            DECL_SELF_REFERENCE_P.
    
    gcc/testsuite/ChangeLog:
    
            PR c++/52625
            * g++.dg/template/friend70.C: New test.

Diff:
---
 gcc/cp/pt.c                              | 4 ++++
 gcc/testsuite/g++.dg/template/friend70.C | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d0bea4a5266..20bc198efac 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -969,6 +969,10 @@ maybe_process_partial_specialization (tree type)
   if (CLASS_TYPE_P (type) && CLASSTYPE_LAMBDA_EXPR (type))
     return type;
 
+  /* An injected-class-name is not a specialization.  */
+  if (DECL_SELF_REFERENCE_P (TYPE_NAME (type)))
+    return type;
+
   if (TREE_CODE (type) == BOUND_TEMPLATE_TEMPLATE_PARM)
     {
       error ("name of class shadows template template parameter %qD",
diff --git a/gcc/testsuite/g++.dg/template/friend70.C b/gcc/testsuite/g++.dg/template/friend70.C
new file mode 100644
index 00000000000..54965486f79
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend70.C
@@ -0,0 +1,9 @@
+// PR c++/52625
+
+template<class>
+class base {};
+
+class derived : public base<derived>
+{
+  template<class> friend class base;
+};