From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <msebor@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1930)
 id 40A673858D28; Thu, 16 Dec 2021 22:13:47 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40A673858D28
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Martin Sebor <msebor@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-6024] Check for class type before assuming a type is one
 [PR103703].
X-Act-Checkin: gcc
X-Git-Author: Martin Sebor <msebor@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: f91814c22595e1db642140efe030caf2c092ab6f
X-Git-Newrev: 93faac7e32e4f9503c559f2a3e5a4732f5e9ea09
Message-Id: <20211216221347.40A673858D28@sourceware.org>
Date: Thu, 16 Dec 2021 22:13:47 +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: Thu, 16 Dec 2021 22:13:47 -0000

https://gcc.gnu.org/g:93faac7e32e4f9503c559f2a3e5a4732f5e9ea09

commit r12-6024-g93faac7e32e4f9503c559f2a3e5a4732f5e9ea09
Author: Martin Sebor <msebor@redhat.com>
Date:   Thu Dec 16 15:11:45 2021 -0700

    Check for class type before assuming a type is one [PR103703].
    
    Resolves:
    PR c++/103703 - ICE with -Wmismatched-tags with friends and templates
    
    gcc/cp/ChangeLog:
    
            PR c++/103703
            * parser.c (class_decl_loc_t::diag_mismatched_tags): Check for class
            type before assuming a type is one.
    
    gcc/testsuite/ChangeLog:
    
            PR c++/103703
            * g++.dg/warn/Wmismatched-tags-9.C: New test.

Diff:
---
 gcc/cp/parser.c                                |  2 +-
 gcc/testsuite/g++.dg/warn/Wmismatched-tags-9.C | 32 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 5d72201f87c..9cf74357ac9 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -33527,7 +33527,7 @@ class_decl_loc_t::diag_mismatched_tags (tree type_decl)
   class_decl_loc_t *cdlguide = this;
 
   tree type = TREE_TYPE (type_decl);
-  if (CLASSTYPE_IMPLICIT_INSTANTIATION (type))
+  if (CLASS_TYPE_P (type) && CLASSTYPE_IMPLICIT_INSTANTIATION (type))
     {
       /* For implicit instantiations of a primary template look up
 	 the primary or partial specialization and use it as
diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-tags-9.C b/gcc/testsuite/g++.dg/warn/Wmismatched-tags-9.C
new file mode 100644
index 00000000000..2712c4de1f6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wmismatched-tags-9.C
@@ -0,0 +1,32 @@
+/* PR c++/103703 - ICE with -Wmismatched-tags with friends and templates
+   { dg-do compile }
+   { dg-options "-Wall -Wmismatched-tags" } */
+
+template <typename T>
+struct A
+{
+  struct B { };
+};
+
+template <typename T>
+struct C
+{
+  friend class A<C>::B;       // { dg-warning "-Wmismatched-tags" "pr102036" { xfail *-*-* } }
+};
+
+template struct C<int>;
+
+
+template <typename T>
+struct D
+{
+  friend class A<D>::B;       // okay, specialized as class below
+};
+
+template <>
+struct A<long>
+{
+  class B { };
+};
+
+template struct D<long>;