averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-04-30 20:37:34 -07:00
parent 8b5ba43ce4 ea526c6383
commit 9b6f01b6d9
25 changed files with 211 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Serialization/ModuleFile.cpp
View File

@@ -2028,7 +2028,8 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
return error(Status::FailedToLoadBridgingHeader);
}
ModuleDecl *importedHeaderModule = clangImporter->getImportedHeaderModule();
dependency.Import = { {}, importedHeaderModule };
dependency.Import = ModuleDecl::ImportedModule{ModuleDecl::AccessPathTy(),
importedHeaderModule};
continue;
}
@@ -2076,14 +2077,15 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
}
if (scopePath.empty()) {
dependency.Import = { {}, module };
dependency.Import =
ModuleDecl::ImportedModule{ModuleDecl::AccessPathTy(), module};
} else {
auto scopeID = ctx.getIdentifier(scopePath);
assert(!scopeID.empty() &&
"invalid decl name (non-top-level decls not supported)");
Located<Identifier> accessPathElem = { scopeID, SourceLoc() };
dependency.Import = {ctx.AllocateCopy(llvm::makeArrayRef(accessPathElem)),
module};
dependency.Import = ModuleDecl::ImportedModule{
ctx.AllocateCopy(llvm::makeArrayRef(accessPathElem)), module};
}
// SPI
@@ -2291,7 +2293,7 @@ void ModuleFile::getImportedModules(
}
assert(dep.isLoaded());
results.push_back(dep.Import);
results.push_back(*(dep.Import));
}
}
@@ -2666,7 +2668,7 @@ void ModuleFile::lookupImportedSPIGroups(const ModuleDecl *importedModule,
SmallVectorImpl<Identifier> &spiGroups) const {
for (auto &dep : Dependencies) {
auto depSpis = dep.spiGroups;
if (dep.Import.second == importedModule &&
if (dep.Import.hasValue() && dep.Import->importedModule == importedModule &&
!depSpis.empty()) {
spiGroups.append(depSpis.begin(), depSpis.end());
}