diff options
| author | Marek Polacek <polacek@redhat.com> | 2022-05-27 10:51:30 -0400 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2022-05-27 12:01:51 -0400 |
| commit | d822f4bbd714c6595f70cc68888dcebecfb6662d (patch) | |
| tree | 160001393e90df8bce2b1930c7ebe8bc495d6360 /gcc/cp/parser.cc | |
| parent | ca4b95069ca7dbf0be3a5aae053631e7a1b20103 (diff) | |
| download | gcc-d822f4bbd714c6595f70cc68888dcebecfb6662d.zip gcc-d822f4bbd714c6595f70cc68888dcebecfb6662d.tar.gz gcc-d822f4bbd714c6595f70cc68888dcebecfb6662d.tar.bz2 | |
c++: Fix ICE with -Wmismatched-tags [PR105725]
Here we ICE with -Wmismatched-tags on something like
template <class T>
bool B<T, enable_if_t<is_class_v<class T::foo>>>;
Specifically, the "class T::foo" bit. There, class_decl_loc_t::add gets
a TYPENAME_TYPE as TYPE, rather than a class/union type, so checking
TYPE_BEING_DEFINED will crash. I think it's OK to allow a TYPENAME_TYPE to
slip into that function; we just shouldn't consider the 'class' tag redundant
(which works as a 'typename'). In fact, every other compiler *requires* it.
PR c++/105725
gcc/cp/ChangeLog:
* parser.cc (class_decl_loc_t::add): Check CLASS_TYPE_P.
gcc/testsuite/ChangeLog:
* g++.dg/warn/Wmismatched-tags-10.C: New test.
Diffstat (limited to 'gcc/cp/parser.cc')
| -rw-r--r-- | gcc/cp/parser.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 4b98595..9a9f859 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -33666,7 +33666,8 @@ class_decl_loc_t::add (cp_parser *parser, location_t key_loc, bool key_redundant = (!def_p && !decl_p && (decl == type_decl || TREE_CODE (decl) == TEMPLATE_DECL - || TYPE_BEING_DEFINED (type))); + || (CLASS_TYPE_P (type) + && TYPE_BEING_DEFINED (type)))); if (key_redundant && class_key != class_type @@ -33704,7 +33705,7 @@ class_decl_loc_t::add (cp_parser *parser, location_t key_loc, } else { - /* TYPE was previously defined in some unknown precompiled hdeader. + /* TYPE was previously defined in some unknown precompiled header. Simply add a record of its definition at an unknown location and proceed below to add a reference to it at the current location. (Declarations in precompiled headers that are not definitions |