diff options
| author | Davide Italiano <davide@freebsd.org> | 2019-03-14 17:23:08 +0000 |
|---|---|---|
| committer | Davide Italiano <davide@freebsd.org> | 2019-03-14 17:23:08 +0000 |
| commit | f6a84ed30b2839a67ffdbf3771d4610d305669d5 (patch) | |
| tree | f3475a5e97dd21dbef6bd13ecee675e881bfa0db /lldb/source | |
| parent | 70d156991ca425b2c472935e144e98ce205c666c (diff) | |
| download | bcm5719-llvm-f6a84ed30b2839a67ffdbf3771d4610d305669d5.tar.gz bcm5719-llvm-f6a84ed30b2839a67ffdbf3771d4610d305669d5.zip | |
[Python] Start eradicating unneeded LLDB_DISABLE_PYTHON guards.
While we don't have a bot, I'm testing by hand that this configuration
compiles. We'll probably set up one once I'm done flensing.
llvm-svn: 356171
Diffstat (limited to 'lldb/source')
4 files changed, 0 insertions, 15 deletions
diff --git a/lldb/source/DataFormatters/FormattersHelpers.cpp b/lldb/source/DataFormatters/FormattersHelpers.cpp index 9f8fc72f10a..b2bd1ebdfed 100644 --- a/lldb/source/DataFormatters/FormattersHelpers.cpp +++ b/lldb/source/DataFormatters/FormattersHelpers.cpp @@ -73,7 +73,6 @@ void lldb_private::formatters::AddOneLineSummary( category_sp->GetTypeSummariesContainer()->Add(type_name, summary_sp); } -#ifndef LLDB_DISABLE_PYTHON void lldb_private::formatters::AddCXXSummary( TypeCategoryImpl::SharedPointer category_sp, CXXFunctionSummaryFormat::Callback funct, const char *description, @@ -117,7 +116,6 @@ void lldb_private::formatters::AddFilter( else category_sp->GetTypeFiltersContainer()->Add(type_name, filter_sp); } -#endif size_t lldb_private::formatters::ExtractIndexFromString(const char *item_name) { if (!item_name || !*item_name) diff --git a/lldb/source/DataFormatters/TypeCategory.cpp b/lldb/source/DataFormatters/TypeCategory.cpp index 4dd487450cd..8ed0ccd3577 100644 --- a/lldb/source/DataFormatters/TypeCategory.cpp +++ b/lldb/source/DataFormatters/TypeCategory.cpp @@ -19,9 +19,7 @@ TypeCategoryImpl::TypeCategoryImpl( : m_format_cont("format", "regex-format", clist), m_summary_cont("summary", "regex-summary", clist), m_filter_cont("filter", "regex-filter", clist), -#ifndef LLDB_DISABLE_PYTHON m_synth_cont("synth", "regex-synth", clist), -#endif m_validator_cont("validator", "regex-validator", clist), m_enabled(false), m_change_listener(clist), m_mutex(), m_name(name), m_languages() { for (const lldb::LanguageType lang : langs) diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp b/lldb/source/DataFormatters/TypeSynthetic.cpp index ccc5d198b22..89ebd919727 100644 --- a/lldb/source/DataFormatters/TypeSynthetic.cpp +++ b/lldb/source/DataFormatters/TypeSynthetic.cpp @@ -125,8 +125,6 @@ lldb::ValueObjectSP SyntheticChildrenFrontEnd::CreateValueObjectFromData( return valobj_sp; } -#ifndef LLDB_DISABLE_PYTHON - ScriptedSyntheticChildren::FrontEnd::FrontEnd(std::string pclass, ValueObject &backend) : SyntheticChildrenFrontEnd(backend), m_python_class(pclass), @@ -218,5 +216,3 @@ std::string ScriptedSyntheticChildren::GetDescription() { return sstr.GetString(); } - -#endif // #ifndef LLDB_DISABLE_PYTHON diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp index 2e451f44425..32562451c8c 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -418,7 +418,6 @@ static void LoadLibCxxFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { .SetShowMembersOneLiner(false) .SetHideItemNames(false); -#ifndef LLDB_DISABLE_PYTHON AddCXXSummary(cpp_category_sp, lldb_private::formatters::LibcxxStringSummaryProviderASCII, "std::string summary provider", @@ -680,7 +679,6 @@ static void LoadLibCxxFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { "std::map iterator synthetic children", ConstString("^std::__[[:alnum:]]+::__map_iterator<.+>$"), stl_synth_flags, true); -#endif } static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { @@ -751,8 +749,6 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { "std::char_traits<wchar_t>, std::allocator<wchar_t> >"), cxx11_wstring_summary_sp); -#ifndef LLDB_DISABLE_PYTHON - SyntheticChildren::Flags stl_synth_flags; stl_synth_flags.SetCascades(true).SetSkipPointers(false).SetSkipReferences( false); @@ -841,7 +837,6 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { "libstdc++ std::weak_ptr summary provider", ConstString("^std::weak_ptr<.+>(( )?&)?$"), stl_summary_flags, true); -#endif } static void LoadSystemFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { @@ -866,7 +861,6 @@ static void LoadSystemFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { .SetShowMembersOneLiner(false) .SetHideItemNames(false); -#ifndef LLDB_DISABLE_PYTHON // FIXME because of a bug in the FormattersContainer we need to add a summary // for both X* and const X* (<rdar://problem/12717717>) AddCXXSummary( @@ -919,7 +913,6 @@ static void LoadSystemFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { AddCXXSummary( cpp_category_sp, lldb_private::formatters::Char16SummaryProvider, "unichar summary provider", ConstString("unichar"), widechar_flags); -#endif } std::unique_ptr<Language::TypeScavenger> CPlusPlusLanguage::GetTypeScavenger() { |

