From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 93FAA38582BD; Fri, 3 Mar 2023 13:11:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93FAA38582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677849081; bh=UKc9qF6ejXfNGuAzgMXo6OFpYciPQ4Cb91mGYRZhK80=; h=From:To:Subject:Date:From; b=kFWvxqggqLYpwU0hNrIhwkXiVFVjzJYWPgGUzaJyiaGhQsIZ5qRadfMowQbHSmp+n IXgDR1LTW4dUcuIvavsmAmXqBCOj1PVCN9ShNKk+wAS+tA4N0F0bX1HHi9xQgyYK3V 1OT7KRbd2sA9irnFB5iEHKvP6H7NAJIOKC9dvFrg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] [libstdc++] [prettyprint] add local std::string use to more tests X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: dc1be3eb33c7f37ac45ad0ccf5be063134a513be X-Git-Newrev: eea3ffc800cc5f15d0f73a3ee7ea78d7ffdb84c5 Message-Id: <20230303131121.93FAA38582BD@sourceware.org> Date: Fri, 3 Mar 2023 13:11:21 +0000 (GMT) List-Id: https://gcc.gnu.org/g:eea3ffc800cc5f15d0f73a3ee7ea78d7ffdb84c5 commit eea3ffc800cc5f15d0f73a3ee7ea78d7ffdb84c5 Author: Alexandre Oliva Date: Fri Mar 3 10:10:23 2023 -0300 [libstdc++] [prettyprint] add local std::string use to more tests We're getting regressions after ugprading to GDB 13 in a few of the libstdc++ pretty-printing tests. It might seem like a GDB regression, but that update has a new symbol reader, and Tom Tromey says it exposes a latent problem in the pretty-printer, namely, when a name is not defined locally in the local translation unit, GDB will look for it in other units, and if multiple different definitions are available, there are no guarantees as to which one it will find. Since libstdc++ contains units in which std::string maps to different types, in order to ensure the tests get the std::string definition we expect, we need std::string to be present in the debug information for the test itself, as we already do in other tests. for libstdc++-v3/ChangeLog * testsuite/libstdc++-pretty-printers/80276.cc: Add std::string to debug info. * testsuite/libstdc++-pretty-printers/libfundts.cc: Likewise. Change-Id: I928617d44679c63d634c26f6db17d7580a9bcd8f TN: W223-034 Diff: --- libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc | 5 +++++ libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc index db4de593808..1d6b0207106 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc @@ -36,6 +36,11 @@ int main() { using namespace std; + // Ensure debug info for std::string is issued in the local + // translation unit, so that GDB won't pick up any alternate + // std::string notion that might be present in libstdc++.so. + string bah = "hi"; + (void)bah; unique_ptr*>>> p1; unique_ptr*>>[]> p2; unique_ptr*>>[10]> p3; diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc index b1c91033cc8..29e8bc8f194 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc @@ -32,6 +32,12 @@ using std::experimental::string_view; int main() { + // Ensure debug info for std::string is issued in the local + // translation unit, so that GDB won't pick up any alternate + // std::string notion that might be present in libstdc++.so. + std::string bah = "hi"; + (void)bah; + string_view str = "string"; // { dg-final { note-test str "\"string\"" } }