The change to only look at the global binding for non-classes meant that here, when dealing with decimal32 which is magically mangled like its first non-static data member, we got a collision with the mangling for float. Fixed by also looking up an existing binding for such magical classes.
Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/100261 gcc/cp/ChangeLog: * rtti.c (get_tinfo_decl_direct): Check TYPE_TRANSPARENT_AGGR. gcc/testsuite/ChangeLog: * g++.dg/dfp/mangle-6.C: New test. --- gcc/cp/rtti.c | 2 +- gcc/testsuite/g++.dg/dfp/mangle-6.C | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/dfp/mangle-6.C diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 5a33b83afd0..82eaa286514 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -433,7 +433,7 @@ get_tinfo_decl_direct (tree type, tree name, int pseudo_ix) if (!name) name = mangle_typeinfo_for_type (type); - if (!CLASS_TYPE_P (type)) + if (!CLASS_TYPE_P (type) || TYPE_TRANSPARENT_AGGR (type)) d = get_global_binding (name); if (!d) diff --git a/gcc/testsuite/g++.dg/dfp/mangle-6.C b/gcc/testsuite/g++.dg/dfp/mangle-6.C new file mode 100644 index 00000000000..9cfb2a974bb --- /dev/null +++ b/gcc/testsuite/g++.dg/dfp/mangle-6.C @@ -0,0 +1,19 @@ +// PR c++/100261 +// { dg-do compile } + +#include <typeinfo> + +namespace std { + namespace decimal { + class decimal32 { + float private__decfloat32; + }; + } +} + +void +foo () +{ + typeid (float); + typeid (std::decimal::decimal32); +} base-commit: a8daf9a19a5eae6b98acede14bb6c27b2e0038e0 prerequisite-patch-id: fb7c30e47894d15da192dc59d09c05a26d29076f -- 2.27.0