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/main' into next

Browse Source
This commit is contained in:
swift_jenkins
2020-10-11 12:57:42 -07:00
parent d1716bca5a e843a16649
commit ab605d0f44
49 changed files with 843 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Serialization/ModuleFile.cpp
View File

@@ -167,8 +167,8 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc) {
return error(Status::FailedToLoadBridgingHeader);
}
ModuleDecl *importedHeaderModule = clangImporter->getImportedHeaderModule();
dependency.Import = ModuleDecl::ImportedModule{ImportPath::Access(),
importedHeaderModule};
dependency.Import = ImportedModule{ImportPath::Access(),
importedHeaderModule};
continue;
}
@@ -212,7 +212,7 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc) {
continue;
}
dependency.Import = ModuleDecl::ImportedModule{accessPath, module};
dependency.Import = ImportedModule{accessPath, module};
// SPI
StringRef spisStr = dependency.Core.RawSPIs;
@@ -420,9 +420,8 @@ PrecedenceGroupDecl *ModuleFile::lookupPrecedenceGroup(Identifier name) {
return cast<PrecedenceGroupDecl>(getDecl(data[0].second));
}
void ModuleFile::getImportedModules(
SmallVectorImpl<ModuleDecl::ImportedModule> &results,
ModuleDecl::ImportFilter filter) {
void ModuleFile::getImportedModules(SmallVectorImpl<ImportedModule> &results,
ModuleDecl::ImportFilter filter) {
PrettyStackTraceModuleFile stackEntry(*this);
for (auto &dep : Dependencies) {