Extend FindTypes with CompilerContext to allow filtering by language.
This patch is also motivated by the Swift branch and is effectively NFC for the single-TypeSystem llvm.org branch.
In multi-language projects it is extremely common to have, e.g., a
Clang type and a similarly-named rendition of that same type in
another language. When searching for a type It is much cheaper to pass
a set of supported languages to the SymbolFile than having it
materialize every result and then rejecting the materialized types
that have the wrong language.
Differential Revision: https://reviews.llvm.org/D66546
<rdar://problem/54471165>
llvm-svn: 369690
diff --git a/lldb/source/Target/Language.cpp b/lldb/source/Target/Language.cpp
index 3c3ef28..43d0be0 100644
--- a/lldb/source/Target/Language.cpp
+++ b/lldb/source/Target/Language.cpp
@@ -357,26 +357,16 @@
return supported_languages;
}
-void Language::GetLanguagesSupportingTypeSystems(
- std::set<lldb::LanguageType> &languages,
- std::set<lldb::LanguageType> &languages_for_expressions) {
- uint32_t idx = 0;
-
- while (TypeSystemEnumerateSupportedLanguages enumerate = PluginManager::
- GetTypeSystemEnumerateSupportedLanguagesCallbackAtIndex(idx++)) {
- (*enumerate)(languages, languages_for_expressions);
- }
+LanguageSet Language::GetLanguagesSupportingTypeSystems() {
+ return PluginManager::GetAllTypeSystemSupportedLanguagesForTypes();
}
-void Language::GetLanguagesSupportingREPLs(
- std::set<lldb::LanguageType> &languages) {
- uint32_t idx = 0;
+LanguageSet Language::GetLanguagesSupportingTypeSystemsForExpressions() {
+ return PluginManager::GetAllTypeSystemSupportedLanguagesForExpressions();
+}
- while (REPLEnumerateSupportedLanguages enumerate =
- PluginManager::GetREPLEnumerateSupportedLanguagesCallbackAtIndex(
- idx++)) {
- (*enumerate)(languages);
- }
+LanguageSet Language::GetLanguagesSupportingREPLs() {
+ return PluginManager::GetREPLAllTypeSystemSupportedLanguages();
}
std::unique_ptr<Language::TypeScavenger> Language::GetTypeScavenger() {
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 2368fa1..957b97e 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -206,13 +206,11 @@
lldb::REPLSP Target::GetREPL(Status &err, lldb::LanguageType language,
const char *repl_options, bool can_create) {
if (language == eLanguageTypeUnknown) {
- std::set<LanguageType> repl_languages;
+ LanguageSet repl_languages = Language::GetLanguagesSupportingREPLs();
- Language::GetLanguagesSupportingREPLs(repl_languages);
-
- if (repl_languages.size() == 1) {
- language = *repl_languages.begin();
- } else if (repl_languages.size() == 0) {
+ if (auto single_lang = repl_languages.GetSingularLanguage()) {
+ language = *single_lang;
+ } else if (repl_languages.Empty()) {
err.SetErrorStringWithFormat(
"LLDB isn't configured with REPL support for any languages.");
return REPLSP();
@@ -2129,23 +2127,18 @@
if (language == eLanguageTypeMipsAssembler // GNU AS and LLVM use it for all
// assembly code
|| language == eLanguageTypeUnknown) {
- std::set<lldb::LanguageType> languages_for_types;
- std::set<lldb::LanguageType> languages_for_expressions;
+ LanguageSet languages_for_expressions =
+ Language::GetLanguagesSupportingTypeSystemsForExpressions();
- Language::GetLanguagesSupportingTypeSystems(languages_for_types,
- languages_for_expressions);
-
- if (languages_for_expressions.count(eLanguageTypeC)) {
+ if (languages_for_expressions[eLanguageTypeC]) {
language = eLanguageTypeC; // LLDB's default. Override by setting the
// target language.
} else {
- if (languages_for_expressions.empty()) {
+ if (languages_for_expressions.Empty())
return llvm::make_error<llvm::StringError>(
"No expression support for any languages",
llvm::inconvertibleErrorCode());
- } else {
- language = *languages_for_expressions.begin();
- }
+ language = (LanguageType)languages_for_expressions.bitvector.find_first();
}
}
@@ -2159,21 +2152,19 @@
std::vector<TypeSystem *> scratch_type_systems;
- std::set<lldb::LanguageType> languages_for_types;
- std::set<lldb::LanguageType> languages_for_expressions;
+ LanguageSet languages_for_expressions =
+ Language::GetLanguagesSupportingTypeSystemsForExpressions();
- Language::GetLanguagesSupportingTypeSystems(languages_for_types,
- languages_for_expressions);
-
- for (auto lang : languages_for_expressions) {
+ for (auto bit : languages_for_expressions.bitvector.set_bits()) {
+ auto language = (LanguageType)bit;
auto type_system_or_err =
- GetScratchTypeSystemForLanguage(lang, create_on_demand);
+ GetScratchTypeSystemForLanguage(language, create_on_demand);
if (!type_system_or_err)
LLDB_LOG_ERROR(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_TARGET),
type_system_or_err.takeError(),
"Language '{}' has expression support but no scratch type "
"system available",
- Language::GetNameForLanguageType(lang));
+ Language::GetNameForLanguageType(language));
else
scratch_type_systems.emplace_back(&type_system_or_err.get());
}