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

[Serialization] Fix deserialization crash occurring when a mixed framework fails to load its ObjC part.

Browse Source 
rdar://27709042
This commit is contained in:
Argyrios Kyrtzidis
2016-08-04 15:59:05 -07:00
parent b841f1eaa5
commit 3bc81f7df4
7 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/ModuleFile.cpp
View File

@@ -1093,7 +1093,7 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
"invalid module name (submodules not yet supported)");
}
auto module = getModule(modulePath);
if (!module) {
if (!module || module->failedToLoad()) {
// If we're missing the module we're shadowing, treat that specially.
if (modulePath.size() == 1 &&
modulePath.front() == file->getParentModule()->getName()) {