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

Don't crash if a -filelist file doesn't exist or doesn't contain the primary file.

Browse Source 
I know this is the frontend and not the driver, but c'mon.
This commit is contained in:
John McCall
2016-04-22 10:29:58 -07:00
parent 2931c21540
commit e4ddee46c0
3 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/Frontend/CompilerInvocation.cpp
View File

@@ -112,32 +112,46 @@ static void debugFailWithCrash() {
LLVM_BUILTIN_TRAP;
}
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;
if (primaryFileArg)
primaryFile = primaryFileArg->getValue();
/// Try to read a file list file.
///
/// Returns false on error.
static bool readFileList(DiagnosticEngine &diags,
std::vector<std::string> &inputFiles,
const llvm::opt::Arg *filelistPath,
const llvm::opt::Arg *primaryFileArg = nullptr,
unsigned *primaryFileIndex = nullptr) {
assert((primaryFileArg == nullptr) || (primaryFileIndex != nullptr) &&
"did not provide argument for primary file index");
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> buffer =
llvm::MemoryBuffer::getFile(filelistPath->getValue());
assert(buffer && "can't read filelist; unrecoverable");
if (!buffer) {
diags.diagnose(SourceLoc(), diag::cannot_open_file,
filelistPath->getValue(), buffer.getError().message());
return false;
}
bool foundPrimaryFile = false;
if (primaryFileIndex) *primaryFileIndex = 0;
for (StringRef line : make_range(llvm::line_iterator(*buffer.get()), {})) {
inputFiles.push_back(line);
if (foundPrimaryFile)
if (foundPrimaryFile || primaryFileArg == nullptr)
continue;
if (line == primaryFile)
if (line == primaryFileArg->getValue())
foundPrimaryFile = true;
else
++primaryFileIndex;
++*primaryFileIndex;
}
if (primaryFileArg)
assert(foundPrimaryFile && "primary file not found in filelist");
return primaryFileIndex;
if (primaryFileArg && !foundPrimaryFile) {
diags.diagnose(SourceLoc(), diag::error_primary_file_not_found,
primaryFileArg->getValue(), filelistPath->getValue());
return false;
}
return true;
}
static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
@@ -199,11 +213,13 @@ 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 = readFileList(Opts.InputFilenames, A,
primaryFileArg);
if (primaryFileArg)
Opts.PrimaryInput = SelectedInput(primaryFileIndex);
assert(!Args.hasArg(OPT_INPUT) && "mixing -filelist with inputs");
unsigned primaryFileIndex = 0;
if (readFileList(Diags, Opts.InputFilenames, A,
primaryFileArg, &primaryFileIndex)) {
if (primaryFileArg)
Opts.PrimaryInput = SelectedInput(primaryFileIndex);
assert(!Args.hasArg(OPT_INPUT) && "mixing -filelist with inputs");
}
} else {
for (const Arg *A : make_range(Args.filtered_begin(OPT_INPUT,
OPT_primary_file),
@@ -355,7 +371,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Opts.InputKind = InputFileKind::IFK_Swift;
if (const Arg *A = Args.getLastArg(OPT_output_filelist)) {
readFileList(Opts.OutputFilenames, A);
readFileList(Diags, Opts.OutputFilenames, A);
assert(!Args.hasArg(OPT_o) && "don't use -o with -output-filelist");
} else {
Opts.OutputFilenames = Args.getAllArgValues(OPT_o);