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

Teach the frontend about -output-filelist.

Browse Source 
Finishes up https://bugs.swift.org/browse/SR-280. At this point, nothing
should be passing O(N) arguments on the command line, where N is the
number of input source files, unless N is small.

(There are other inputs which are passed through to subtools, and these
are not put into filelists. That's fine.)
This commit is contained in:
Jordan Rose
2016-01-13 18:15:02 -08:00
parent ce34ed593c
commit bcff26193e
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Frontend/CompilerInvocation.cpp
View File

@@ -91,9 +91,9 @@ static void debugFailWithCrash() {
LLVM_BUILTIN_TRAP;
}
static unsigned readInputFileList(std::vector<std::string> &inputFiles,
const llvm::opt::Arg *filelistPath,
const llvm::opt::Arg *primaryFileArg) {
static unsigned readFileList(std::vector<std::string> &inputFiles,
const llvm::opt::Arg *filelistPath,
const llvm::opt::Arg *primaryFileArg = nullptr) {
bool foundPrimaryFile = false;
unsigned primaryFileIndex = 0;
StringRef primaryFile;
@@ -173,8 +173,8 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
if (const Arg *A = Args.getLastArg(OPT_filelist)) {
const Arg *primaryFileArg = Args.getLastArg(OPT_primary_file);
auto primaryFileIndex = readInputFileList(Opts.InputFilenames, A,
primaryFileArg);
auto primaryFileIndex = readFileList(Opts.InputFilenames, A,
primaryFileArg);
if (primaryFileArg)
Opts.PrimaryInput = SelectedInput(primaryFileIndex);
assert(!Args.hasArg(OPT_INPUT) && "mixing -filelist with inputs");
@@ -328,7 +328,12 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
else
Opts.InputKind = InputFileKind::IFK_Swift;
Opts.OutputFilenames = Args.getAllArgValues(OPT_o);
if (const Arg *A = Args.getLastArg(OPT_output_filelist)) {
readFileList(Opts.OutputFilenames, A);
assert(!Args.hasArg(OPT_o) && "don't use -o with -output-filelist");
} else {
Opts.OutputFilenames = Args.getAllArgValues(OPT_o);
}
bool UserSpecifiedModuleName = false;
{