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

Renaming FrontendInputs -> FrontendInputsAndOutputs

Browse Source 
Fix comment in ArtsToFrontendOptionsConverter re getOutputFilenamesFromCommandLineOrFilelist
This commit is contained in:
David Ungar
2018-01-23 22:17:58 -08:00
committed by David Ungar
parent 02fcdf150d
commit a9819b6e60
23 changed files with 168 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Frontend/CompilerInvocation.cpp
View File

@@ -818,10 +818,11 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
if (!SILOpts.SILOutputFileNameForDebugging.empty()) {
Opts.MainInputFilename = SILOpts.SILOutputFileNameForDebugging;
} else if (const InputFile *input =
FrontendOpts.Inputs.getUniquePrimaryInput()) {
FrontendOpts.InputsAndOutputs.getUniquePrimaryInput()) {
Opts.MainInputFilename = input->file();
} else if (FrontendOpts.Inputs.hasSingleInput()) {
Opts.MainInputFilename = FrontendOpts.Inputs.getFilenameOfFirstInput();
} else if (FrontendOpts.InputsAndOutputs.hasSingleInput()) {
Opts.MainInputFilename =
FrontendOpts.InputsAndOutputs.getFilenameOfFirstInput();
}
Opts.OutputFilenames = FrontendOpts.OutputFilenames;
Opts.ModuleName = FrontendOpts.ModuleName;
@@ -1064,7 +1065,7 @@ CompilerInvocation::setUpInputForSILTool(
// If it looks like we have an AST, set the source file kind to SIL and the
// name of the module to the file's name.
getFrontendOptions().Inputs.addInput(
getFrontendOptions().InputsAndOutputs.addInput(
InputFile(inputFilename, bePrimary, fileBufOrErr.get().get()));
auto result = serialization::validateSerializedAST(