c++, abi: Fix abi_tag attribute handling [PR98481]
authorJakub Jelinek <jakub@redhat.com>
Thu, 7 Jan 2021 16:47:18 +0000 (17:47 +0100)
committerJason Merrill <jason@redhat.com>
Mon, 11 Jan 2021 16:12:48 +0000 (11:12 -0500)
commit3dd0d3ee1d2a988e7f3a3e8f009fcf328f16d2ed
tree9dfb8f62a37b9b2871383eb8efa1268dfb2851a4
parent8c09b788a96ddf63b282a8f92c02ad23535c912f
c++, abi: Fix abi_tag attribute handling [PR98481]

In GCC10 cp_walk_subtrees has been changed to walk template arguments.
As the following testcase, that changed the mangling of some functions.
I believe the previous behavior that find_abi_tags_r doesn't recurse into
template args has been the correct one, but setting *walk_subtrees = 0
for the types and handling the types subtree walking manually in
find_abi_tags_r looks too hard, there are a lot of subtrees and details what
should and shouldn't be walked, both in tree.c (walk_type_fields there,
which is static) and in cp_walk_subtrees itself.

The following patch abuses the fact that *walk_subtrees is an int to
tell cp_walk_subtrees it shouldn't walk the template args.

Co-authored-by: Jason Merrill <jason@redhat.com>
gcc/cp/ChangeLog:

PR c++/98481
* class.c (find_abi_tags_r): Set *walk_subtrees to 2 instead of 1
for types.
(mark_abi_tags_r): Likewise.
* decl2.c (min_vis_r): Likewise.
* tree.c (cp_walk_subtrees): If *walk_subtrees_p is 2, look through
typedefs.

gcc/testsuite/ChangeLog:

PR c++/98481
* g++.dg/abi/abi-tag24.C: New test.
gcc/cp/class.c
gcc/cp/decl2.c
gcc/cp/tree.c
gcc/testsuite/g++.dg/abi/abi-tag24.C [new file with mode: 0644]