File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -244,7 +244,6 @@ struct InterfaceSubContextDelegateImpl: InterfaceSubContextDelegate {
244
244
llvm::StringSaver ArgSaver;
245
245
std::vector<StringRef> GenericArgs;
246
246
CompilerInvocation subInvocation;
247
- std::vector<SupplementaryOutputPaths> ModuleOutputPaths;
248
247
249
248
template <typename ...ArgTypes>
250
249
InFlightDiagnostic diagnose (StringRef interfacePath,
Original file line number Diff line number Diff line change @@ -1340,7 +1340,7 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
1340
1340
assert (BuildArgs.size () == GenericArgs.size ());
1341
1341
// Configure inputs
1342
1342
subInvocation.getFrontendOptions ().InputsAndOutputs
1343
- .addPrimaryInputFile (interfacePath);
1343
+ .addInputFile (interfacePath);
1344
1344
BuildArgs.push_back (interfacePath);
1345
1345
subInvocation.setModuleName (moduleName);
1346
1346
BuildArgs.push_back (" -module-name" );
@@ -1357,13 +1357,12 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
1357
1357
}
1358
1358
1359
1359
// Configure the outputs in front-end options. There must be an equal number of
1360
- // primary inputs and outputs.
1361
- auto N = subInvocation.getFrontendOptions ().InputsAndOutputs
1362
- .primaryInputCount ();
1363
- std::vector<std::string> outputFiles (N, " /<unused>" );
1360
+ // inputs and outputs.
1361
+ std::vector<std::string> outputFiles{" /<unused>" };
1362
+ std::vector<SupplementaryOutputPaths> ModuleOutputPaths;
1364
1363
ModuleOutputPaths.emplace_back ();
1365
1364
ModuleOutputPaths.back ().ModuleOutputPath = outputPath.str ();
1366
- assert (N == ModuleOutputPaths. size ());
1365
+ assert (subInvocation. getFrontendOptions (). InputsAndOutputs . isWholeModule ());
1367
1366
subInvocation.getFrontendOptions ().InputsAndOutputs
1368
1367
.setMainAndSupplementaryOutputs (outputFiles, ModuleOutputPaths);
1369
1368
You can’t perform that action at this time.
0 commit comments