From bc69dd2cfae37a335b9a0125e161c54548a9d2a5 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 9 Dec 2019 17:04:46 -0800 Subject: [PATCH] [FormatManager] GetCandidateLanguages shouldn't know about ValueObject. Reviewers: jingham, teemperor, JDevlieghere, aprantl Subscribers: lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D71236 --- lldb/include/lldb/DataFormatters/FormatManager.h | 3 --- lldb/source/DataFormatters/FormatClasses.cpp | 3 ++- lldb/source/DataFormatters/FormatManager.cpp | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lldb/include/lldb/DataFormatters/FormatManager.h b/lldb/include/lldb/DataFormatters/FormatManager.h index 66df839..5487728 100644 --- a/lldb/include/lldb/DataFormatters/FormatManager.h +++ b/lldb/include/lldb/DataFormatters/FormatManager.h @@ -189,9 +189,6 @@ public: GetCandidateLanguages(lldb::LanguageType lang_type); private: - static std::vector - GetCandidateLanguages(ValueObject &valobj); - static void GetPossibleMatches(ValueObject &valobj, CompilerType compiler_type, uint32_t reason, lldb::DynamicValueType use_dynamic, diff --git a/lldb/source/DataFormatters/FormatClasses.cpp b/lldb/source/DataFormatters/FormatClasses.cpp index 271963b..6a9279f 100644 --- a/lldb/source/DataFormatters/FormatClasses.cpp +++ b/lldb/source/DataFormatters/FormatClasses.cpp @@ -24,7 +24,8 @@ FormattersMatchData::FormattersMatchData(ValueObject &valobj, m_formatters_match_vector({}, false), m_type_for_cache(), m_candidate_languages() { m_type_for_cache = FormatManager::GetTypeForCache(valobj, use_dynamic); - m_candidate_languages = FormatManager::GetCandidateLanguages(valobj); + m_candidate_languages = + FormatManager::GetCandidateLanguages(valobj.GetObjectRuntimeLanguage()); } FormattersMatchVector FormattersMatchData::GetMatchesVector() { diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index 33aa2dc..8ae9bcc 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -238,7 +238,8 @@ void FormatManager::GetPossibleMatches( } } - for (lldb::LanguageType language_type : GetCandidateLanguages(valobj)) { + for (lldb::LanguageType language_type : + GetCandidateLanguages(valobj.GetObjectRuntimeLanguage())) { if (Language *language = Language::FindPlugin(language_type)) { for (ConstString candidate : language->GetPossibleFormattersMatches(valobj, use_dynamic)) { @@ -579,8 +580,7 @@ ConstString FormatManager::GetTypeForCache(ValueObject &valobj, } std::vector -FormatManager::GetCandidateLanguages(ValueObject &valobj) { - lldb::LanguageType lang_type = valobj.GetObjectRuntimeLanguage(); +FormatManager::GetCandidateLanguages(lldb::LanguageType lang_type) { switch (lang_type) { case lldb::eLanguageTypeC: case lldb::eLanguageTypeC89: -- 2.7.4