Skip to content

Swift SR-12247: Convert ModuleDecl::ImportedModule from std::pair to struct #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2020
Merged

Swift SR-12247: Convert ModuleDecl::ImportedModule from std::pair to struct #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,7 @@ std::unique_ptr<Language::TypeScavenger> SwiftLanguage::GetTypeScavenger() {
swift::ModuleDecl::AccessPathTy access_path;

for (auto imported_module : swift::namelookup::getAllImports(module)) {
auto module = imported_module.second;
auto module = imported_module.importedModule;
TypesOrDecls local_results;
ast_ctx->FindTypesOrDecls(input, module, local_results,
false);
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Symbol/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4047,7 +4047,7 @@ void SwiftASTContext::LoadModule(swift::ModuleDecl *swift_module,
};

for (auto import : swift::namelookup::getAllImports(swift_module)) {
import.second->collectLinkLibraries(addLinkLibrary);
import.importedModule->collectLinkLibraries(addLinkLibrary);
}
error = current_error;
}
Expand Down Expand Up @@ -8466,7 +8466,7 @@ bool SwiftASTContext::CacheUserImports(SwiftASTContext &swift_ast_context,
sc.target_sp->GetSwiftPersistentExpressionState(exe_scope);

for (auto module_pair : parsed_imports) {
swift::ModuleDecl *module = module_pair.second;
swift::ModuleDecl *module = module_pair.importedModule;
if (module) {
std::string module_name;
GetNameFromModule(module, module_name);
Expand Down