Revert "Add support for language plugins to provide data formatters"
This reverts r246515 (and related cmake fixes) as it breaks all libcxx tests.
llvm-svn: 246536
diff --git a/lldb/source/DataFormatters/CMakeLists.txt b/lldb/source/DataFormatters/CMakeLists.txt
index 691190a..ad29369 100644
--- a/lldb/source/DataFormatters/CMakeLists.txt
+++ b/lldb/source/DataFormatters/CMakeLists.txt
@@ -9,7 +9,6 @@
FormatCache.cpp
FormatClasses.cpp
FormatManager.cpp
- LanguageCategory.cpp
LibCxx.cpp
LibCxxInitializerList.cpp
LibCxxList.cpp
diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp
index 52209ca..e41d341 100644
--- a/lldb/source/DataFormatters/FormatManager.cpp
+++ b/lldb/source/DataFormatters/FormatManager.cpp
@@ -16,13 +16,10 @@
#include "lldb/Core/Debugger.h"
#include "lldb/DataFormatters/CXXFormatterFunctions.h"
-#include "lldb/DataFormatters/LanguageCategory.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Platform.h"
#include "llvm/ADT/STLExtras.h"
-#include <initializer_list>
-
using namespace lldb;
using namespace lldb_private;
@@ -475,20 +472,6 @@
return validator_chosen_sp;
}
-void
-FormatManager::LoopThroughCategories (CategoryCallback callback, void* param)
-{
- m_categories_map.LoopThrough(callback, param);
- for (const auto& entry : m_language_categories_map)
- {
- if (auto category_sp = entry.second->GetCategory())
- {
- if (!callback(param, category_sp))
- break;
- }
- }
-}
-
lldb::TypeCategoryImplSP
FormatManager::GetCategory (const ConstString& category_name,
bool can_create)
@@ -613,8 +596,8 @@
}
ConstString
-FormatManager::GetTypeForCache (ValueObject& valobj,
- lldb::DynamicValueType use_dynamic)
+GetTypeForCache (ValueObject& valobj,
+ lldb::DynamicValueType use_dynamic)
{
if (use_dynamic == lldb::eNoDynamicValues)
{
@@ -635,28 +618,6 @@
return ConstString();
}
-static std::initializer_list<lldb::LanguageType>
-GetCandidateLanguages (ValueObject& valobj)
-{
- lldb::LanguageType lang_type = valobj.GetObjectRuntimeLanguage();
- switch (lang_type)
- {
- default:
- return {lang_type};
- }
-}
-
-LanguageCategory*
-FormatManager::GetCategoryForLanguage (lldb::LanguageType lang_type)
-{
- auto iter = m_language_categories_map.find(lang_type), end = m_language_categories_map.end();
- if (iter != end)
- return iter->second.get();
- LanguageCategory* lang_category = new LanguageCategory(lang_type);
- m_language_categories_map[lang_type] = LanguageCategory::UniquePointer(lang_category);
- return lang_category;
-}
-
lldb::TypeFormatImplSP
FormatManager::GetHardcodedFormat (ValueObject& valobj,
lldb::DynamicValueType use_dynamic)
@@ -694,29 +655,7 @@
if (log)
log->Printf("[FormatManager::GetFormat] Cache search failed. Going normal route");
}
-
- FormattersMatchVector matches = GetPossibleMatches(valobj, use_dynamic);
-
- retval = m_categories_map.GetFormat(valobj, use_dynamic, matches);
- if (!retval)
- {
- if (log)
- log->Printf("[FormatManager::GetFormat] Search failed. Giving language a chance.");
- for (lldb::LanguageType lang_type : GetCandidateLanguages(valobj))
- {
- if (LanguageCategory* lang_category = GetCategoryForLanguage(lang_type))
- {
- if (lang_category->Get(valobj, use_dynamic, matches, retval))
- break;
- }
- }
- if (retval)
- {
- if (log)
- log->Printf("[FormatManager::GetFormat] Language search success. Returning.");
- return retval;
- }
- }
+ retval = m_categories_map.GetFormat(valobj, use_dynamic);
if (!retval)
{
if (log)
@@ -774,29 +713,7 @@
if (log)
log->Printf("[FormatManager::GetSummaryFormat] Cache search failed. Going normal route");
}
-
- FormattersMatchVector matches = GetPossibleMatches(valobj, use_dynamic);
-
- retval = m_categories_map.GetSummaryFormat(valobj, use_dynamic, matches);
- if (!retval)
- {
- if (log)
- log->Printf("[FormatManager::GetSummaryFormat] Search failed. Giving language a chance.");
- for (lldb::LanguageType lang_type : GetCandidateLanguages(valobj))
- {
- if (LanguageCategory* lang_category = GetCategoryForLanguage(lang_type))
- {
- if (lang_category->Get(valobj, use_dynamic, matches, retval))
- break;
- }
- }
- if (retval)
- {
- if (log)
- log->Printf("[FormatManager::GetSummaryFormat] Language search success. Returning.");
- return retval;
- }
- }
+ retval = m_categories_map.GetSummaryFormat(valobj, use_dynamic);
if (!retval)
{
if (log)
@@ -855,29 +772,7 @@
if (log)
log->Printf("[FormatManager::GetSyntheticChildren] Cache search failed. Going normal route");
}
-
- FormattersMatchVector matches = GetPossibleMatches(valobj, use_dynamic);
-
- retval = m_categories_map.GetSyntheticChildren(valobj, use_dynamic, matches);
- if (!retval)
- {
- if (log)
- log->Printf("[FormatManager::GetSyntheticChildren] Search failed. Giving language a chance.");
- for (lldb::LanguageType lang_type : GetCandidateLanguages(valobj))
- {
- if (LanguageCategory* lang_category = GetCategoryForLanguage(lang_type))
- {
- if (lang_category->Get(valobj, use_dynamic, matches, retval))
- break;
- }
- }
- if (retval)
- {
- if (log)
- log->Printf("[FormatManager::GetSyntheticChildren] Language search success. Returning.");
- return retval;
- }
- }
+ retval = m_categories_map.GetSyntheticChildren(valobj, use_dynamic);
if (!retval)
{
if (log)
@@ -923,29 +818,7 @@
if (log)
log->Printf("[FormatManager::GetValidator] Cache search failed. Going normal route");
}
-
- FormattersMatchVector matches = GetPossibleMatches(valobj, use_dynamic);
-
- retval = m_categories_map.GetValidator(valobj, use_dynamic, matches);
- if (!retval)
- {
- if (log)
- log->Printf("[FormatManager::GetValidator] Search failed. Giving language a chance.");
- for (lldb::LanguageType lang_type : GetCandidateLanguages(valobj))
- {
- if (LanguageCategory* lang_category = GetCategoryForLanguage(lang_type))
- {
- if (lang_category->Get(valobj, use_dynamic, matches, retval))
- break;
- }
- }
- if (retval)
- {
- if (log)
- log->Printf("[FormatManager::GetValidator] Language search success. Returning.");
- return retval;
- }
- }
+ retval = m_categories_map.GetValidator(valobj, use_dynamic);
if (!retval)
{
if (log)
@@ -984,7 +857,6 @@
m_named_summaries_map(this),
m_last_revision(0),
m_categories_map(this),
- m_language_categories_map(),
m_default_category_name(ConstString("default")),
m_system_category_name(ConstString("system")),
m_gnu_cpp_category_name(ConstString("gnu-libstdc++")),
@@ -1211,7 +1083,17 @@
lldb::TypeSummaryImplSP std_wstring_summary_sp(new CXXFunctionSummaryFormat(stl_summary_flags, lldb_private::formatters::LibcxxWStringSummaryProvider, "std::wstring summary provider"));
TypeCategoryImpl::SharedPointer libcxx_category_sp = GetCategory(m_libcxx_category_name);
+
+ libcxx_category_sp->GetTypeSummariesContainer()->Add(ConstString("std::__1::string"),
+ std_string_summary_sp);
+ libcxx_category_sp->GetTypeSummariesContainer()->Add(ConstString("std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >"),
+ std_string_summary_sp);
+ libcxx_category_sp->GetTypeSummariesContainer()->Add(ConstString("std::__1::wstring"),
+ std_wstring_summary_sp);
+ libcxx_category_sp->GetTypeSummariesContainer()->Add(ConstString("std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> >"),
+ std_wstring_summary_sp);
+
SyntheticChildren::Flags stl_synth_flags;
stl_synth_flags.SetCascades(true).SetSkipPointers(false).SetSkipReferences(false);
diff --git a/lldb/source/DataFormatters/LanguageCategory.cpp b/lldb/source/DataFormatters/LanguageCategory.cpp
deleted file mode 100644
index 5d6d432..0000000
--- a/lldb/source/DataFormatters/LanguageCategory.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//===-- LanguageCategory.cpp ---------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/DataFormatters/LanguageCategory.h"
-
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
-#include "lldb/DataFormatters/FormatManager.h"
-#include "lldb/DataFormatters/TypeCategory.h"
-#include "lldb/DataFormatters/TypeFormat.h"
-#include "lldb/DataFormatters/TypeSummary.h"
-#include "lldb/DataFormatters/TypeSynthetic.h"
-#include "lldb/DataFormatters/TypeValidator.h"
-#include "lldb/Target/Language.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-LanguageCategory::LanguageCategory (lldb::LanguageType lang_type) :
- m_category_sp(),
- m_format_cache()
-{
- if (Language* language_plugin = Language::FindPlugin(lang_type))
- m_category_sp = language_plugin->GetFormatters();
- if (m_category_sp)
- m_category_sp->Enable(true, 1);
-}
-
-bool
-LanguageCategory::Get (ValueObject& valobj,
- lldb::DynamicValueType dynamic,
- FormattersMatchVector matches,
- lldb::TypeFormatImplSP& format_sp)
-{
- if (!m_category_sp)
- return false;
-
- ConstString type_name = FormatManager::GetTypeForCache(valobj, dynamic);
- if (type_name)
- {
- if (m_format_cache.GetFormat(type_name, format_sp))
- return true;
- }
- bool result = m_category_sp->Get(valobj, matches, format_sp);
- if (type_name && (!format_sp || !format_sp->NonCacheable()))
- {
- m_format_cache.SetFormat(type_name, format_sp);
- }
- return result;
-}
-
-bool
-LanguageCategory::Get (ValueObject& valobj,
- lldb::DynamicValueType dynamic,
- FormattersMatchVector matches,
- lldb::TypeSummaryImplSP& format_sp)
-{
- if (!m_category_sp)
- return false;
-
- ConstString type_name = FormatManager::GetTypeForCache(valobj, dynamic);
- if (type_name)
- {
- if (m_format_cache.GetSummary(type_name, format_sp))
- return true;
- }
- bool result = m_category_sp->Get(valobj, matches, format_sp);
- if (type_name && (!format_sp || !format_sp->NonCacheable()))
- {
- m_format_cache.SetSummary(type_name, format_sp);
- }
- return result;
-}
-
-bool
-LanguageCategory::Get (ValueObject& valobj,
- lldb::DynamicValueType dynamic,
- FormattersMatchVector matches,
- lldb::SyntheticChildrenSP& format_sp)
-{
- if (!m_category_sp)
- return false;
-
- ConstString type_name = FormatManager::GetTypeForCache(valobj, dynamic);
- if (type_name)
- {
- if (m_format_cache.GetSynthetic(type_name, format_sp))
- return true;
- }
- bool result = m_category_sp->Get(valobj, matches, format_sp);
- if (type_name && (!format_sp || !format_sp->NonCacheable()))
- {
- m_format_cache.SetSynthetic(type_name, format_sp);
- }
- return result;
-}
-
-bool
-LanguageCategory::Get (ValueObject& valobj,
- lldb::DynamicValueType dynamic,
- FormattersMatchVector matches,
- lldb::TypeValidatorImplSP& format_sp)
-{
- if (!m_category_sp)
- return false;
-
- ConstString type_name = FormatManager::GetTypeForCache(valobj, dynamic);
- if (type_name)
- {
- if (m_format_cache.GetValidator(type_name, format_sp))
- return true;
- }
- bool result = m_category_sp->Get(valobj, matches, format_sp);
- if (type_name && (!format_sp || !format_sp->NonCacheable()))
- {
- m_format_cache.SetValidator(type_name, format_sp);
- }
- return result;
-}
-
-lldb::TypeCategoryImplSP
-LanguageCategory::GetCategory () const
-{
- return m_category_sp;
-}
diff --git a/lldb/source/DataFormatters/TypeCategoryMap.cpp b/lldb/source/DataFormatters/TypeCategoryMap.cpp
index 3494a8a..96b9e6d 100644
--- a/lldb/source/DataFormatters/TypeCategoryMap.cpp
+++ b/lldb/source/DataFormatters/TypeCategoryMap.cpp
@@ -219,8 +219,7 @@
lldb::TypeFormatImplSP
TypeCategoryMap::GetFormat (ValueObject& valobj,
- lldb::DynamicValueType use_dynamic,
- FormattersMatchVector matches)
+ lldb::DynamicValueType use_dynamic)
{
Mutex::Locker locker(m_map_mutex);
@@ -229,6 +228,8 @@
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
+ FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+
for (begin = m_active_categories.begin(); begin != end; begin++)
{
lldb::TypeCategoryImplSP category_sp = *begin;
@@ -246,8 +247,7 @@
lldb::TypeSummaryImplSP
TypeCategoryMap::GetSummaryFormat (ValueObject& valobj,
- lldb::DynamicValueType use_dynamic,
- FormattersMatchVector matches)
+ lldb::DynamicValueType use_dynamic)
{
Mutex::Locker locker(m_map_mutex);
@@ -256,6 +256,8 @@
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
+ FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+
for (begin = m_active_categories.begin(); begin != end; begin++)
{
lldb::TypeCategoryImplSP category_sp = *begin;
@@ -274,8 +276,7 @@
#ifndef LLDB_DISABLE_PYTHON
lldb::SyntheticChildrenSP
TypeCategoryMap::GetSyntheticChildren (ValueObject& valobj,
- lldb::DynamicValueType use_dynamic,
- FormattersMatchVector matches)
+ lldb::DynamicValueType use_dynamic)
{
Mutex::Locker locker(m_map_mutex);
@@ -285,6 +286,8 @@
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
+ FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+
for (begin = m_active_categories.begin(); begin != end; begin++)
{
lldb::TypeCategoryImplSP category_sp = *begin;
@@ -303,8 +306,7 @@
lldb::TypeValidatorImplSP
TypeCategoryMap::GetValidator (ValueObject& valobj,
- lldb::DynamicValueType use_dynamic,
- FormattersMatchVector matches)
+ lldb::DynamicValueType use_dynamic)
{
Mutex::Locker locker(m_map_mutex);
@@ -313,6 +315,8 @@
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
+ FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+
for (begin = m_active_categories.begin(); begin != end; begin++)
{
lldb::TypeCategoryImplSP category_sp = *begin;