[lldb][test] Combine libstdc++ and libc++ std::map tests into generic test

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

@@ -1515,8 +1515,8 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
   AddCXXSynthetic(
       cpp_category_sp,
       lldb_private::formatters::LibstdcppMapIteratorSyntheticFrontEndCreator,
-      "std::map iterator synthetic children", "^std::_Rb_tree_iterator<.+>$",
-      stl_synth_flags, true);
+      "std::map iterator synthetic children",
+      "^std::_Rb_tree_(const_)?iterator<.+>$", stl_synth_flags, true);
 
   AddCXXSynthetic(
       cpp_category_sp,

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile → lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/Makefile

@@ -1,5 +1,3 @@
 CXX_SOURCES := main.cpp
 
-USE_LIBSTDCPP := 1
-
 include Makefile.rules

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py → lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/TestDataFormatterStdMap.py

@@ -2,14 +2,13 @@
 Test lldb data formatter subsystem.
 """
 
-
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
-class LibcxxMapDataFormatterTestCase(TestBase):
+class StdMapDataFormatterTestCase(TestBase):
     def setUp(self):
         TestBase.setUp(self)
         ns = "ndk" if lldbplatformutil.target_is_android() else ""
@@ -22,10 +21,8 @@ def check_pair(self, first_value, second_value):
         ]
         return ValueCheck(children=pair_children)
 
-    @add_test_categories(["libc++"])
-    def test_with_run_command(self):
+    def do_test(self):
         """Test that that file and class static variables display correctly."""
-        self.build()
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         bkpt = self.target().FindBreakpointByID(
@@ -326,3 +323,23 @@ def cleanup():
         lldbutil.continue_to_breakpoint(self.process(), bkpt)
 
         self.expect("frame variable ss", substrs=["%s::map" % ns, "size=0", "{}"])
+
+    @add_test_categories(["libc++"])
+    def test_libcxx(self):
+        self.build(dictionary={"USE_LIBCPP": 1})
+        self.do_test()
+
+    @add_test_categories(["libstdcxx"])
+    def test_libstdcxx(self):
+        self.build(dictionary={"USE_LIBSTDCPP": 1})
+        self.do_test()
+
+    @expectedFailureAll(
+        bugnumber="Don't support formatting __gnu_debug::_Safe_iterator yet"
+    )
+    @add_test_categories(["libstdcxx"])
+    def test_libstdcxx_debug(self):
+        self.build(
+            dictionary={"USE_LIBSTDCPP": 1, "CXXFLAGS_EXTRAS": "-D_GLIBCXX_DEBUG"}
+        )
+        self.do_test()

lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/main.cpp

@@ -0,0 +1,80 @@
+#include <map>
+#include <string>
+
+#define intint_map std::map<int, int>
+#define strint_map std::map<std::string, int>
+#define intstr_map std::map<int, std::string>
+#define strstr_map std::map<std::string, std::string>
+
+int g_the_foo = 0;
+
+int thefoo_rw(int arg = 1) {
+  if (arg < 0)
+    arg = 0;
+  if (!arg)
+    arg = 1;
+  g_the_foo += arg;
+  return g_the_foo;
+}
+
+int main() {
+  intint_map ii;
+
+  ii[0] = 0; // Set break point at this line.
+  ii[1] = 1;
+
+  intint_map::iterator it = ii.begin();
+  intint_map::const_iterator const_it = ii.cbegin();
+  std::printf("%d %d\n", it->second, const_it->second);
+
+  thefoo_rw(1); // Set break point at this line.
+  ii[2] = 0;
+  ii[3] = 1;
+  thefoo_rw(1); // Set break point at this line.
+  ii[4] = 0;
+  ii[5] = 1;
+  ii[6] = 0;
+  ii[7] = 1;
+  thefoo_rw(1); // Set break point at this line.
+  ii[85] = 1234567;
+
+  ii.clear();
+
+  strint_map si;
+  thefoo_rw(1); // Set break point at this line.
+
+  si["zero"] = 0;
+  thefoo_rw(1); // Set break point at this line.
+  si["one"] = 1;
+  si["two"] = 2;
+  si["three"] = 3;
+  thefoo_rw(1); // Set break point at this line.
+  si["four"] = 4;
+
+  si.clear();
+  thefoo_rw(1); // Set break point at this line.
+
+  intstr_map is;
+  thefoo_rw(1); // Set break point at this line.
+  is[85] = "goofy";
+  is[1] = "is";
+  is[2] = "smart";
+  is[3] = "!!!";
+  thefoo_rw(1); // Set break point at this line.
+
+  is.clear();
+  thefoo_rw(1); // Set break point at this line.
+
+  strstr_map ss;
+  thefoo_rw(1); // Set break point at this line.
+
+  ss["ciao"] = "hello";
+  ss["casa"] = "house";
+  ss["gatto"] = "cat";
+  thefoo_rw(1); // Set break point at this line.
+  ss["a Mac.."] = "..is always a Mac!";
+
+  ss.clear();
+  thefoo_rw(1); // Set break point at this line.
+  return 0;
+}