diff options
| -rw-r--r-- | lldb/include/lldb/DataFormatters/TypeCategory.h | 2 | ||||
| -rw-r--r-- | lldb/source/DataFormatters/TypeCategory.cpp | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lldb/include/lldb/DataFormatters/TypeCategory.h b/lldb/include/lldb/DataFormatters/TypeCategory.h index dc5edb65494..f37c661d56d 100644 --- a/lldb/include/lldb/DataFormatters/TypeCategory.h +++ b/lldb/include/lldb/DataFormatters/TypeCategory.h @@ -391,7 +391,7 @@ private: void Disable() { Enable(false, UINT32_MAX); } - bool IsApplicable(ValueObject &valobj); + bool IsApplicable(lldb::LanguageType lang); uint32_t GetLastEnabledPosition() { return m_enabled_position; } diff --git a/lldb/source/DataFormatters/TypeCategory.cpp b/lldb/source/DataFormatters/TypeCategory.cpp index be3b31603ea..4f8ea5d4341 100644 --- a/lldb/source/DataFormatters/TypeCategory.cpp +++ b/lldb/source/DataFormatters/TypeCategory.cpp @@ -60,11 +60,10 @@ static bool IsApplicable(lldb::LanguageType category_lang, } } -bool TypeCategoryImpl::IsApplicable(ValueObject &valobj) { - lldb::LanguageType valobj_lang = valobj.GetObjectRuntimeLanguage(); +bool TypeCategoryImpl::IsApplicable(lldb::LanguageType lang) { for (size_t idx = 0; idx < GetNumLanguages(); idx++) { const lldb::LanguageType category_lang = GetLanguageAtIndex(idx); - if (::IsApplicable(category_lang, valobj_lang)) + if (::IsApplicable(category_lang, lang)) return true; } return false; @@ -89,7 +88,7 @@ void TypeCategoryImpl::AddLanguage(lldb::LanguageType lang) { bool TypeCategoryImpl::Get(ValueObject &valobj, const FormattersMatchVector &candidates, lldb::TypeFormatImplSP &entry, uint32_t *reason) { - if (!IsEnabled() || !IsApplicable(valobj)) + if (!IsEnabled() || !IsApplicable(valobj.GetObjectRuntimeLanguage())) return false; if (GetTypeFormatsContainer()->Get(candidates, entry, reason)) return true; @@ -102,7 +101,7 @@ bool TypeCategoryImpl::Get(ValueObject &valobj, bool TypeCategoryImpl::Get(ValueObject &valobj, const FormattersMatchVector &candidates, lldb::TypeSummaryImplSP &entry, uint32_t *reason) { - if (!IsEnabled() || !IsApplicable(valobj)) + if (!IsEnabled() || !IsApplicable(valobj.GetObjectRuntimeLanguage())) return false; if (GetTypeSummariesContainer()->Get(candidates, entry, reason)) return true; @@ -115,7 +114,7 @@ bool TypeCategoryImpl::Get(ValueObject &valobj, bool TypeCategoryImpl::Get(ValueObject &valobj, const FormattersMatchVector &candidates, lldb::SyntheticChildrenSP &entry, uint32_t *reason) { - if (!IsEnabled() || !IsApplicable(valobj)) + if (!IsEnabled() || !IsApplicable(valobj.GetObjectRuntimeLanguage())) return false; TypeFilterImpl::SharedPointer filter_sp; uint32_t reason_filter = 0; |
