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

Allow implementation-only imports to be missing when debugging

Browse Source 
This will be tested on the LLDB side.
This commit is contained in:
Jordan Rose
2019-03-28 15:41:50 -07:00
parent 526ea54f43
commit e89e66ca1f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Serialization/ModuleFile.cpp
View File

@@ -1514,8 +1514,16 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
continue;
}
if (dependency.isImplementationOnly() && !treatAsPartialModule)
if (dependency.isImplementationOnly() &&
!(treatAsPartialModule || ctx.LangOpts.DebuggerSupport)) {
// When building normally (and not merging partial modules), we don't
// want to bring in the implementation-only module, because that might
// change the set of visible declarations. However, when debugging we
// want to allow getting at the internals of this module when possible,
// and so we'll try to reference the implementation-only module if it's
// available.
continue;
}
StringRef modulePathStr = dependency.RawPath;
StringRef scopePath;
@@ -1544,7 +1552,8 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
// Otherwise, continue trying to load dependencies, so that we can list
// everything that's missing.
missingDependency = true;
if (!(dependency.isImplementationOnly() && ctx.LangOpts.DebuggerSupport))
missingDependency = true;
continue;
}