diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
@@ -909,7 +909,7 @@
       cpp_category_sp,
       lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEndCreator,
       "std::map iterator synthetic children",
-      ConstString("^std::__[[:alnum:]]+::__map_iterator<.+>$"), stl_synth_flags,
+      ConstString("^std::__[[:alnum:]]+::__map_(const_)?iterator<.+>$"), stl_synth_flags,
       true);
 
   AddCXXSynthetic(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
@@ -116,6 +116,16 @@
                     substrs=['first =',
                              'second ='])
 
+        # (Non-)const key/val iterators
+        self.expect_expr("it", result_children=[
+            ValueCheck(name="first", value="0"),
+            ValueCheck(name="second", value="0")
+        ])
+        self.expect_expr("const_it", result_children=[
+            ValueCheck(name="first", value="0"),
+            ValueCheck(name="second", value="0")
+        ])
+
         # check that MightHaveChildren() gets it right
         self.assertTrue(
             self.frame().FindVariable("ii").MightHaveChildren(),
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp
@@ -24,7 +24,12 @@
     
     ii[0] = 0; // Set break point at this line.
     ii[1] = 1;
-	thefoo_rw(1);  // Set break point at this line.
+
+    intint_map::iterator it = ii.begin();
+    intint_map::const_iterator const_it = ii.cbegin();
+    std::printf("%d %d", 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.