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-06-16 21:38:08 -07:00
parent 559178f949 2b9fd78b91
commit 20ba5d3171
13 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1349,7 +1349,7 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
assert(BuildArgs.size() == GenericArgs.size());
// Configure inputs
subInvocation.getFrontendOptions().InputsAndOutputs
.addPrimaryInputFile(interfacePath);
.addInputFile(interfacePath);
BuildArgs.push_back(interfacePath);
subInvocation.setModuleName(moduleName);
BuildArgs.push_back("-module-name");
@@ -1366,13 +1366,12 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
}
// Configure the outputs in front-end options. There must be an equal number of
// primary inputs and outputs.
auto N = subInvocation.getFrontendOptions().InputsAndOutputs
.primaryInputCount();
std::vector<std::string> outputFiles(N, "/<unused>");
// inputs and outputs.
std::vector<std::string> outputFiles{"/<unused>"};
std::vector<SupplementaryOutputPaths> ModuleOutputPaths;
ModuleOutputPaths.emplace_back();
ModuleOutputPaths.back().ModuleOutputPath = outputPath.str();
assert(N == ModuleOutputPaths.size());
assert(subInvocation.getFrontendOptions().InputsAndOutputs.isWholeModule());
subInvocation.getFrontendOptions().InputsAndOutputs
.setMainAndSupplementaryOutputs(outputFiles, ModuleOutputPaths);