[LLDB] Add formatters for MSVC STL std::shared_ptr

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

@@ -1623,33 +1623,17 @@ static void LoadCommonStlFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
           },
           "MSVC STL/libstdc++ std::wstring summary provider"));
 
-  auto smart_ptr_creator =
-      [](CXXSyntheticChildren *children,
-         ValueObjectSP valobj_sp) -> SyntheticChildrenFrontEnd * {
-    if (!valobj_sp)
-      return nullptr;
-
-    if (auto *msvc = MsvcStlSmartPointerSyntheticFrontEndCreator(valobj_sp))
-      return msvc;
-
-    return LibStdcppSharedPtrSyntheticFrontEndCreator(children, valobj_sp);
-  };
-  AddCXXSynthetic(cpp_category_sp, smart_ptr_creator,
+  AddCXXSynthetic(cpp_category_sp, GenericSmartPointerSyntheticFrontEndCreator,
                   "std::shared_ptr synthetic children",
                   "^std::shared_ptr<.+>(( )?&)?$", stl_synth_flags, true);
-  AddCXXSynthetic(cpp_category_sp, smart_ptr_creator,
+  AddCXXSynthetic(cpp_category_sp, GenericSmartPointerSyntheticFrontEndCreator,
                   "std::weak_ptr synthetic children",
                   "^std::weak_ptr<.+>(( )?&)?$", stl_synth_flags, true);
 
-  auto smart_ptr_summary = [](ValueObject &valobj, Stream &stream,
-                              const TypeSummaryOptions &options) {
-    return MsvcStlSmartPointerSummaryProvider(valobj, stream, options) ||
-           LibStdcppSmartPointerSummaryProvider(valobj, stream, options);
-  };
-  AddCXXSummary(cpp_category_sp, smart_ptr_summary,
+  AddCXXSummary(cpp_category_sp, GenericSmartPointerSummaryProvider,
                 "MSVC STL/libstdc++ std::shared_ptr summary provider",
                 "^std::shared_ptr<.+>(( )?&)?$", stl_summary_flags, true);
-  AddCXXSummary(cpp_category_sp, smart_ptr_summary,
+  AddCXXSummary(cpp_category_sp, GenericSmartPointerSummaryProvider,
                 "MSVC STL/libstdc++ std::weak_ptr summary provider",
                 "^std::weak_ptr<.+>(( )?&)?$", stl_summary_flags, true);
 }

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

@@ -7,6 +7,8 @@
 //===---------------------------------------------------------------------===//
 
 #include "Generic.h"
+#include "LibStdcpp.h"
+#include "MsvcStl.h"
 
 lldb::ValueObjectSP lldb_private::formatters::GetDesugaredSmartPointerValue(
     ValueObject &ptr, ValueObject &container) {
@@ -16,7 +18,23 @@ lldb::ValueObjectSP lldb_private::formatters::GetDesugaredSmartPointerValue(
 
   auto arg = container_type.GetTypeTemplateArgument(0);
   if (!arg)
-    return ptr.GetSP(); // FIXME: PDB doesn't have info about template arguments
+    // If there isn't enough debug info, use the pointer type as is
+    return ptr.GetSP();
 
   return ptr.Cast(arg.GetPointerType());
 }
+
+lldb_private::SyntheticChildrenFrontEnd *
+lldb_private::formatters::GenericSmartPointerSyntheticFrontEndCreator(
+    CXXSyntheticChildren *children, lldb::ValueObjectSP valobj_sp) {
+  if (auto *msvc = MsvcStlSmartPointerSyntheticFrontEndCreator(valobj_sp))
+    return msvc;
+
+  return LibStdcppSharedPtrSyntheticFrontEndCreator(children, valobj_sp);
+}
+
+bool lldb_private::formatters::GenericSmartPointerSummaryProvider(
+    ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
+  return MsvcStlSmartPointerSummaryProvider(valobj, stream, options) ||
+         LibStdcppSmartPointerSummaryProvider(valobj, stream, options);
+}

lldb/source/Plugins/Language/CPlusPlus/Generic.h

@@ -24,6 +24,13 @@ bool GenericOptionalSummaryProvider(ValueObject &valobj, Stream &stream,
 lldb::ValueObjectSP GetDesugaredSmartPointerValue(ValueObject &ptr,
                                                   ValueObject &container);
 
+// std::shared_ptr<>/std::weak_ptr<>
+SyntheticChildrenFrontEnd *
+GenericSmartPointerSyntheticFrontEndCreator(CXXSyntheticChildren *children,
+                                            lldb::ValueObjectSP valobj_sp);
+bool GenericSmartPointerSummaryProvider(ValueObject &valobj, Stream &stream,
+                                        const TypeSummaryOptions &options);
+
 } // namespace formatters
 } // namespace lldb_private
 

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

@@ -15,9 +15,7 @@
 using namespace lldb;
 
 bool lldb_private::formatters::IsMsvcStlSmartPointer(ValueObject &valobj) {
-  std::vector<uint32_t> indexes;
-  return valobj.GetCompilerType().GetIndexOfChildMemberWithName("_Ptr", true,
-                                                                indexes) > 0;
+  return valobj.GetChildMemberWithName("_Ptr") != nullptr;
 }
 
 bool lldb_private::formatters::MsvcStlSmartPointerSummaryProvider(

lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/shared_ptr/TestDataFormatterStdSharedPtr.py

@@ -122,5 +122,5 @@ def test_libstdcxx(self):
     @add_test_categories(["msvcstl"])
     def test_msvcstl(self):
         # No flags, because the "msvcstl" category checks that the MSVC STL is used by default.
-        self.build(dictionary={})
+        self.build()
         self.do_test()