Author: enrico
Date: Wed Jul 6 17:35:34 2016
New Revision: 274697
URL: http://llvm.org/viewvc/llvm-project?rev=274697&view=rev
Log:
Fix the installation of the vector<bool> data formatters in order to restore
functionality
Modified:
lldb/trunk/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
Modified: lldb/trunk/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp?rev=274697&r1=274696&r2=274697&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
(original)
+++ lldb/trunk/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp Wed Jul
6 17:35:34 2016
@@ -523,6 +523,7 @@ LoadLibCxxFormatters (lldb::TypeCategory
SyntheticChildren::Flags stl_synth_flags;
stl_synth_flags.SetCascades(true).SetSkipPointers(false).SetSkipReferences(false);
+ AddCXXSynthetic(cpp_category_sp,
lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEndCreator, "libc++
std::vector<bool> synthetic children",
ConstString("^std::__(ndk)?1::vector<bool, std::__(ndk)?1::allocator<bool>
>$"), stl_synth_flags, true);
AddCXXSynthetic(cpp_category_sp,
lldb_private::formatters::LibcxxStdVectorSyntheticFrontEndCreator, "libc++
std::vector synthetic children", ConstString("^std::__(ndk)?1::vector<.+>((
)?&)?$"), stl_synth_flags, true);
AddCXXSynthetic(cpp_category_sp,
lldb_private::formatters::LibcxxStdListSyntheticFrontEndCreator, "libc++
std::list synthetic children", ConstString("^std::__(ndk)?1::list<.+>((
)?&)?$"), stl_synth_flags, true);
AddCXXSynthetic(cpp_category_sp,
lldb_private::formatters::LibcxxStdMapSyntheticFrontEndCreator, "libc++
std::map synthetic children", ConstString("^std::__(ndk)?1::map<.+> >((
)?&)?$"), stl_synth_flags, true);
@@ -543,14 +544,11 @@ LoadLibCxxFormatters (lldb::TypeCategory
AddCXXSynthetic(cpp_category_sp,
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEndCreator, "weak_ptr
synthetic children", ConstString("^(std::__(ndk)?1::)weak_ptr<.+>(( )?&)?$"),
stl_synth_flags, true);
stl_summary_flags.SetDontShowChildren(false);stl_summary_flags.SetSkipPointers(false);
- AddCXXSynthetic(cpp_category_sp,
lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEndCreator, "libc++
std::vector<bool> synthetic children",
ConstString("^std::__(ndk)?1::vector<bool, std::__(ndk)?1::allocator<bool>
>$"), stl_synth_flags);
-
+ AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++
std::vector<bool> summary provider", ConstString("std::__(ndk)?1::vector<bool,
std::__(ndk)?1::allocator<bool> >"), stl_summary_flags, true);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::vector
summary provider", ConstString("^std::__(ndk)?1::vector<.+>(( )?&)?$"),
stl_summary_flags, true);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::list
summary provider", ConstString("^std::__(ndk)?1::list<.+>(( )?&)?$"),
stl_summary_flags, true);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::map
summary provider", ConstString("^std::__(ndk)?1::map<.+>(( )?&)?$"),
stl_summary_flags, true);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::deque
summary provider", ConstString("^std::__(ndk)?1::deque<.+>(( )?&)?$"),
stl_summary_flags, true);
- AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++
std::vector<bool> summary provider",
ConstString("std::__(ndk)?1::vector<std::__(ndk)?1::allocator<bool> >"),
stl_summary_flags);
- AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++
std::vector<bool> summary provider", ConstString("std::__(ndk)?1::vector<bool,
std::__(ndk)?1::allocator<bool> >"), stl_summary_flags);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::set
summary provider", ConstString("^std::__(ndk)?1::set<.+>(( )?&)?$"),
stl_summary_flags, true);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::multiset
summary provider", ConstString("^std::__(ndk)?1::multiset<.+>(( )?&)?$"),
stl_summary_flags, true);
AddCXXSummary(cpp_category_sp,
lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::multimap
summary provider", ConstString("^std::__(ndk)?1::multimap<.+>(( )?&)?$"),
stl_summary_flags, true);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
