From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8ADBF385801F; Tue, 23 Nov 2021 21:17:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8ADBF385801F MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9270] libstdc++: Fix std::type_info::before for ARM [PR103240] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 9a7308bac8c9a90c153a6f25f0c9bf7e2a0f2e73 X-Git-Newrev: ec6ba81a038be488cec5e3bdc4f30b7876d9c5ea Message-Id: <20211123211755.8ADBF385801F@sourceware.org> Date: Tue, 23 Nov 2021 21:17:55 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Nov 2021 21:17:55 -0000 https://gcc.gnu.org/g:ec6ba81a038be488cec5e3bdc4f30b7876d9c5ea commit r11-9270-gec6ba81a038be488cec5e3bdc4f30b7876d9c5ea Author: Jonathan Wakely Date: Tue Nov 16 21:03:21 2021 +0000 libstdc++: Fix std::type_info::before for ARM [PR103240] The r179236 fix for std::type_info::operator== should also have been applied to std::type_info::before. Otherwise two distinct types can compare equivalent due to using a string comparison, when they should do a pointer comparison. libstdc++-v3/ChangeLog: PR libstdc++/103240 * libsupc++/tinfo2.cc (type_info::before): Use unadjusted name to check for the '*' prefix. * testsuite/util/testsuite_shared.cc: Add type_info object for use in new test. * testsuite/18_support/type_info/103240.cc: New test. (cherry picked from commit 054bf99841aad3869c70643b2ba2d9f85770c980) Diff: --- libstdc++-v3/libsupc++/tinfo2.cc | 5 ++- .../testsuite/18_support/type_info/103240.cc | 36 ++++++++++++++++++++++ libstdc++-v3/testsuite/util/testsuite_shared.cc | 12 ++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/libsupc++/tinfo2.cc b/libstdc++-v3/libsupc++/tinfo2.cc index b587cfd037b..d02021fe538 100644 --- a/libstdc++-v3/libsupc++/tinfo2.cc +++ b/libstdc++-v3/libsupc++/tinfo2.cc @@ -36,7 +36,10 @@ type_info::before (const type_info &arg) const _GLIBCXX_NOEXCEPT #if __GXX_MERGED_TYPEINFO_NAMES return name () < arg.name (); #else - return (name ()[0] == '*') ? name () < arg.name () + /* The name() method will strip any leading '*' prefix. Therefore + take care to look at __name rather than name() when looking for + the "pointer" prefix. */ + return (__name[0] == '*') ? name () < arg.name () : __builtin_strcmp (name (), arg.name ()) < 0; #endif } diff --git a/libstdc++-v3/testsuite/18_support/type_info/103240.cc b/libstdc++-v3/testsuite/18_support/type_info/103240.cc new file mode 100644 index 00000000000..3d5968ac25c --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/type_info/103240.cc @@ -0,0 +1,36 @@ +// { dg-do run } +// { dg-require-sharedlib "" } +// { dg-options "./testsuite_shared.so" } + +#include +#include + +namespace __gnu_test +{ +namespace +{ + struct S { }; + struct T { }; +} + +// Defined in testsuite_shared.so, referring to private type in that library +// with the same mangled name as __gnu_test::::S defined here. +extern const std::type_info& pr103240_private_S; +} + +const std::type_info& private_S = __gnu_test::pr103240_private_S; +const std::type_info& local_S = typeid(__gnu_test::S); +const std::type_info& local_T = typeid(__gnu_test::T); + +int main() +{ + VERIFY( local_S == local_S ); + VERIFY( ! local_S.before(local_S) ); + + VERIFY( local_S != local_T ); + VERIFY( local_S.before(local_T) || local_T.before(local_S) ); + + VERIFY( local_S != private_S ); + // PR libstdc++/103240 + VERIFY( local_S.before(private_S) || private_S.before(local_S) ); +} diff --git a/libstdc++-v3/testsuite/util/testsuite_shared.cc b/libstdc++-v3/testsuite/util/testsuite_shared.cc index c4a7ed4abe5..8c10534c511 100644 --- a/libstdc++-v3/testsuite/util/testsuite_shared.cc +++ b/libstdc++-v3/testsuite/util/testsuite_shared.cc @@ -23,6 +23,9 @@ #include #include #include +#if __cpp_rtti +# include +#endif namespace __gnu_test { @@ -130,4 +133,13 @@ try_function_random_fail() } #endif +#if __cpp_rtti +// PR libstdc++/103240 +namespace +{ + struct S { }; +} +const std::type_info& pr103240_private_S = typeid(S); +#endif + } // end namepace __gnu_test