averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Read command line arguments even if filelist is present.

Browse Source
This commit is contained in:
David Ungar
2017-11-15 11:08:42 -08:00
parent ad217f7ce6
commit 70ddd3d53b
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
lib/Frontend/CompilerInvocation.cpp
View File

@@ -117,11 +117,8 @@ class ArgsToFrontendInputsConverter {
struct FilesInfo { struct FilesInfo {
bool hadError; bool hadError;
std::vector<std::pair<StringRef, FileKind>> files; std::vector<std::pair<StringRef, FileKind>> files;
char const *const fileListPath; char const *filelistPath;
static FilesInfo error() {
return {true, std::vector<std::pair<StringRef, FileKind>>(), nullptr};
}
static FilesInfo static FilesInfo
fromFileList(char const *const path, fromFileList(char const *const path,
std::vector<std::pair<StringRef, FileKind>> &&files) { std::vector<std::pair<StringRef, FileKind>> &&files) {
@@ -131,7 +128,7 @@ class ArgsToFrontendInputsConverter {
fromCommandLine(std::vector<std::pair<StringRef, FileKind>> &&files) { fromCommandLine(std::vector<std::pair<StringRef, FileKind>> &&files) {
return {false, std::move(files), nullptr}; return {false, std::move(files), nullptr};
} }
bool mustAddPrimariesToAllFiles() const { return fileListPath == nullptr; } bool mustAddPrimariesToAllFiles() const { return filelistPath == nullptr; }
}; };
public: public:
@@ -160,33 +157,12 @@ private:
} }
FilesInfo getFiles() { FilesInfo getFiles() {
if (const llvm::opt::Arg *filelistPathArg = // Even if filelist is present must do this to read primary file arguments.
Args.getLastArg(options::OPT_filelist)) { FilesInfo info = getFilesFromCommandLine();
char const *const filelistPath = filelistPathArg->getValue(); if (info.hadError)
return getFilesFromFilelist(filelistPath); return info;
} addFilesFromFilelistTo(info);
return getFilesFromCommandLine(); return info;
}
FilesInfo getFilesFromFilelist(char const *const filelistPath) {
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> filelistBufferOrError =
llvm::MemoryBuffer::getFile(filelistPath);
if (!filelistBufferOrError) {
Diags.diagnose(SourceLoc(), diag::cannot_open_file, filelistPath,
filelistBufferOrError.getError().message());
return FilesInfo::error();
}
// Keep buffer alive because code passes around StringRefs.
FilelistBuffer = std::move(*filelistBufferOrError);
std::vector<StringRef> inputFilesFromFilelist(
llvm::line_iterator(*FilelistBuffer), {});
std::vector<std::pair<StringRef, FileKind>> files;
for (auto file : inputFilesFromFilelist) {
files.push_back(std::make_pair(file, FileKind::Secondary));
}
return FilesInfo::fromFileList(filelistPath, std::move(files));
} }
FilesInfo getFilesFromCommandLine() { FilesInfo getFilesFromCommandLine() {
@@ -206,6 +182,28 @@ private:
return FilesInfo::fromCommandLine(std::move(files)); return FilesInfo::fromCommandLine(std::move(files));
} }
void addFilesFromFilelistTo(FilesInfo &info) {
const llvm::opt::Arg *filelistArg = Args.getLastArg(options::OPT_filelist);
if (filelistArg == nullptr)
return;
info.filelistPath = filelistArg->getValue();
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> filelistBufferOrError =
llvm::MemoryBuffer::getFile(info.filelistPath);
if (!filelistBufferOrError) {
Diags.diagnose(SourceLoc(), diag::cannot_open_file, info.filelistPath,
filelistBufferOrError.getError().message());
info.hadError = true;
return;
}
// Keep buffer alive because code passes around StringRefs.
FilelistBuffer = std::move(*filelistBufferOrError);
std::vector<StringRef> inputFilesFromFilelist(
llvm::line_iterator(*FilelistBuffer), {});
for (auto file : inputFilesFromFilelist) {
info.files.push_back(std::make_pair(file, FileKind::Secondary));
}
}
void setInputFilesAndIndices(const FilesInfo &info) { void setInputFilesAndIndices(const FilesInfo &info) {
for (std::pair<StringRef, FileKind> p : info.files) { for (std::pair<StringRef, FileKind> p : info.files) {
if (p.second == FileKind::Secondary || if (p.second == FileKind::Secondary ||
@@ -226,10 +224,10 @@ private:
// Catch "swiftc -frontend -c -filelist foo -primary-file // Catch "swiftc -frontend -c -filelist foo -primary-file
// some-file-not-in-foo". // some-file-not-in-foo".
if (iterator == FileIndices.end()) { if (iterator == FileIndices.end()) {
assert(info.fileListPath != nullptr && assert(info.filelistPath != nullptr &&
"Missing primary with no filelist"); "Missing primary with no filelist");
Diags.diagnose(SourceLoc(), diag::error_primary_file_not_found, file, Diags.diagnose(SourceLoc(), diag::error_primary_file_not_found, file,
info.fileListPath); info.filelistPath);
return true; return true;
} }
Inputs.addPrimaryInputFilename(file, iterator->second); Inputs.addPrimaryInputFilename(file, iterator->second);