diff options
author | Martin Sebor <msebor@redhat.com> | 2021-12-16 15:11:45 -0700 |
---|---|---|
committer | Martin Sebor <msebor@redhat.com> | 2021-12-16 15:11:45 -0700 |
commit | 93faac7e32e4f9503c559f2a3e5a4732f5e9ea09 (patch) | |
tree | 818d8af4159d0ded45bcfe09155eb2a0098c42a1 /gcc | |
parent | f91814c22595e1db642140efe030caf2c092ab6f (diff) | |
download | gcc-93faac7e32e4f9503c559f2a3e5a4732f5e9ea09.zip gcc-93faac7e32e4f9503c559f2a3e5a4732f5e9ea09.tar.gz gcc-93faac7e32e4f9503c559f2a3e5a4732f5e9ea09.tar.bz2 |
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.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/parser.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/warn/Wmismatched-tags-9.C | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5d72201..9cf7435 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 0000000..2712c4d --- /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>; |