diff options
| author | Davide Italiano <ditaliano@apple.com> | 2019-12-09 17:04:46 -0800 |
|---|---|---|
| committer | Davide Italiano <ditaliano@apple.com> | 2019-12-09 17:16:20 -0800 |
| commit | bc69dd2cfae37a335b9a0125e161c54548a9d2a5 (patch) | |
| tree | 84542148d8f03fdbc2f23ae37168e730ed1e3152 /lldb/source | |
| parent | bbf7860b9371799609f0e918e468f8e997f62eb3 (diff) | |
| download | llvm-bc69dd2cfae37a335b9a0125e161c54548a9d2a5.zip llvm-bc69dd2cfae37a335b9a0125e161c54548a9d2a5.tar.gz llvm-bc69dd2cfae37a335b9a0125e161c54548a9d2a5.tar.bz2 | |
[FormatManager] GetCandidateLanguages shouldn't know about ValueObject.
Reviewers: jingham, teemperor, JDevlieghere, aprantl
Subscribers: lldb-commits
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D71236
Diffstat (limited to 'lldb/source')
| -rw-r--r-- | lldb/source/DataFormatters/FormatClasses.cpp | 3 | ||||
| -rw-r--r-- | lldb/source/DataFormatters/FormatManager.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
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<lldb::LanguageType> -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: |