diff options
author | Rui Ueyama <ruiu@google.com> | 2015-06-28 06:05:38 +0300 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2015-06-28 06:05:38 +0300 |
commit | 9d72f09efd3b5c71edffc1fac42c68e6cd2a2207 (patch) | |
tree | a05d0b838d6fb7133a01ae4b99221e06f9bbd0c7 /lld/COFF | |
parent | 06cf3df2d5920de3b006058490a73e2731b034be (diff) |
COFF: Remove a function that doesn't do much itself. NFC.
llvm-svn: 240901
Diffstat (limited to 'lld/COFF')
-rw-r--r-- | lld/COFF/Driver.cpp | 2 | ||||
-rw-r--r-- | lld/COFF/Driver.h | 1 | ||||
-rw-r--r-- | lld/COFF/DriverUtils.cpp | 15 |
3 files changed, 5 insertions, 13 deletions
diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp index 694f99f46236..634b63c425b8 100644 --- a/lld/COFF/Driver.cpp +++ b/lld/COFF/Driver.cpp @@ -233,7 +233,7 @@ bool LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) { return llvm::libDriverMain(ArgsArr.slice(1)) == 0; // Parse command line options. - auto ArgsOrErr = Parser.parseLINK(ArgsArr); + auto ArgsOrErr = Parser.parseLINK(ArgsArr.slice(1)); if (auto EC = ArgsOrErr.getError()) { llvm::errs() << EC.message() << "\n"; return false; diff --git a/lld/COFF/Driver.h b/lld/COFF/Driver.h index 43e800548190..509edb757a6b 100644 --- a/lld/COFF/Driver.h +++ b/lld/COFF/Driver.h @@ -53,7 +53,6 @@ public: } private: - ErrorOr<llvm::opt::InputArgList> parse(std::vector<const char *> Argv); std::vector<const char *> tokenize(StringRef S); ErrorOr<std::vector<const char *>> diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp index 464afb222663..6859e40e710b 100644 --- a/lld/COFF/DriverUtils.cpp +++ b/lld/COFF/DriverUtils.cpp @@ -542,15 +542,15 @@ public: // Parses a given list of options. ErrorOr<llvm::opt::InputArgList> -ArgParser::parse(std::vector<const char *> Argv) { +ArgParser::parse(ArrayRef<const char *> ArgsArr) { // First, replace respnose files (@<file>-style options). - auto ArgvOrErr = replaceResponseFiles(Argv); + auto ArgvOrErr = replaceResponseFiles(ArgsArr); if (auto EC = ArgvOrErr.getError()) { llvm::errs() << "error while reading response file: " << EC.message() << "\n"; return EC; } - Argv = std::move(ArgvOrErr.get()); + std::vector<const char *> Argv = std::move(ArgvOrErr.get()); // Make InputArgList from string vectors. COFFOptTable Table; @@ -571,20 +571,13 @@ ArgParser::parse(std::vector<const char *> Argv) { } ErrorOr<llvm::opt::InputArgList> -ArgParser::parse(llvm::ArrayRef<const char *> Args) { - Args = Args.slice(1); - std::vector<const char *> V(Args.begin(), Args.end()); - return parse(V); -} - -ErrorOr<llvm::opt::InputArgList> ArgParser::parseLINK(ArrayRef<const char *> Args) { // Concatenate LINK env and given arguments and parse them. Optional<std::string> Env = Process::GetEnv("LINK"); if (!Env) return parse(Args); std::vector<const char *> V = tokenize(*Env); - V.insert(V.end(), Args.begin() + 1, Args.end()); + V.insert(V.end(), Args.begin(), Args.end()); return parse(V); } |