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] Remove treatAsPartialModule parameter

Browse Source 
This information can be derived from whether we're
installing the module file into the main module.
This commit is contained in:
Hamish Knight
2020-05-28 12:09:10 -07:00
parent c98c862e7e
commit f810cfcc45
6 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Serialization/ModuleFile.cpp
View File

@@ -1977,9 +1977,7 @@ ModuleFile::ModuleFile(
}
}
Status ModuleFile::associateWithFileContext(FileUnit *file,
SourceLoc diagLoc,
bool treatAsPartialModule) {
Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc) {
PrettyStackTraceModuleFile stackEntry(*this);
assert(!hasError() && "error already detected; should not call this");
@@ -2033,8 +2031,12 @@ Status ModuleFile::associateWithFileContext(FileUnit *file,
continue;
}
// If this module file is being installed into the main module, it's treated
// as a partial module.
auto isPartialModule = M->isMainModule();
if (dependency.isImplementationOnly() &&
!(treatAsPartialModule || ctx.LangOpts.DebuggerSupport)) {
!(isPartialModule || 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