[lldb] review changes.

Author: da-viper

lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp

@@ -1738,8 +1738,9 @@ lldb::TypeCategoryImplSP CPlusPlusLanguage::GetFormatters() {
                                                g_category);
     if (g_category) {
       // NOTE: the libstdcpp formatters are loaded after libcxx formatters
-      // because of a conflict matching the `__debug`namespace in libstdcpp.
-      // since lldb priorities the last loaded matching formatter.
+      // because we don't want to the libcxx formatters to match the potential
+      // `__debug` inline namespace that libstdcpp may use. since LLDB
+      // priorities the last loaded matching formatter.
       LoadLibCxxFormatters(g_category);
       LoadLibStdcppFormatters(g_category);
       LoadSystemFormatters(g_category);

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py

@@ -19,9 +19,24 @@ def setUp(self):
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
     def test_with_run_command(self):
+        build_args = {"EXE": "a.out"}
+        self.with_run_command("", build_args)
+
+    @add_test_categories(["libstdcxx"])
+    @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
+    def test_with_run_command_debug(self):
+        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG", "EXE": "debug_a.out"}
+        self.with_run_command("__debug::", build_args)
+
+    def with_run_command(self, namespace: str, dictionary: dict):
         """Test that that file and class static variables display correctly."""
         self.build()
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
+        self.build(dictionary=dictionary)
+        artifact_name = dictionary.get("EXE", "a.out")
+        self.runCmd(
+            "file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET
+        )
 
         lldbutil.run_break_set_by_source_regexp(self, "Set break point at this line.")
 
@@ -47,8 +62,10 @@ def cleanup():
 
         self.runCmd("frame variable ii --show-types")
 
+        match = f"std::{namespace}map<"
         self.runCmd(
             'type summary add -x "std::map<" --summary-string "map has ${svar%#} items" -e'
+            f'type summary add -x "{match}" --summary-string "map has ${{svar%#}} items" -e'
         )
 
         self.expect("frame variable ii", substrs=["map has 0 items", "{}"])

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py

@@ -18,9 +18,21 @@ def setUp(self):
 
     @add_test_categories(["libstdcxx"])
     def test_with_run_command(self):
+        self.with_run_command({})
+
+    @add_test_categories(["libstdcxx"])
+    def test_with_run_command_debug(self):
+        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG"}
+        self.with_run_command(build_args)
+
+    def with_run_command(self, dictionary: dict):
         """Test that that file and class static variables display correctly."""
-        self.build()
-        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
+        self.build(dictionary=dictionary)
+        artifact_name = dictionary.get("EXE", "a.out")
+        self.runCmd("file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET)
+        self.runCmd(
+            "file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET
+        )
 
         lldbutil.run_break_set_by_file_and_line(
             self, "main.cpp", self.line, num_expected_locations=-1

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py

@@ -19,9 +19,19 @@ def setUp(self):
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
     def test_with_run_command(self):
+        self.with_run_command({})
+
+    @add_test_categories(["libstdcxx"])
+    @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
+    def test_with_run_command_debug(self):
+        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG"}
+        self.with_run_command(build_args)
+
+    def with_run_command(self, dictionary: dict):
         """Test that that file and class static variables display correctly."""
-        self.build()
-        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
+        self.build(dictionary=dictionary)
+        artifact_name = "a.out"
+        self.runCmd("file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_source_regexp(self, "Set break point at this line.")