From 8be49eb927e1e65a715bc6eb73b9ce271c8b24c2 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 3 Mar 2023 15:59:33 -0300 Subject: [PATCH] [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++-prettyprinters/80276.cc: Add std::string to debug info. * testsuite/libstdc++-prettyprinters/libfundts.cc: Likewise. --- libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc | 5 +++++ .../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 db4de593808e..1d6b0207106a 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 b1c91033cc8e..29e8bc8f194e 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\"" } } -- 2.47.2