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-09-10 22:30:58 -07:00
parent 5b1b0670f7 e9650cf4cb
commit b37089c76b
54 changed files with 749 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/Serialization.cpp
View File

@@ -1044,7 +1044,7 @@ void Serializer::writeInputBlock(const SerializationOptions &options) {
auto clangImporter =
static_cast<ClangImporter *>(M->getASTContext().getClangModuleLoader());
ModuleDecl *bridgingHeaderModule = clangImporter->getImportedHeaderModule();
ModuleDecl::ImportedModule bridgingHeaderImport{ModuleDecl::AccessPathTy(),
ModuleDecl::ImportedModule bridgingHeaderImport{ImportPath::Access(),
bridgingHeaderModule};
// Make sure the bridging header module is always at the top of the import