[lld] r240901 - COFF: Remove a function that doesn't do much itself. NFC.

[Rui Ueyama]

Author: ruiu
Date: Sat Jun 27 22:05:38 2015
New Revision: 240901

URL: http://llvm.org/viewvc/llvm-project?rev=240901&view=rev
Log:
COFF: Remove a function that doesn't do much itself. NFC.

Modified:
    lld/trunk/COFF/Driver.cpp
    lld/trunk/COFF/Driver.h
    lld/trunk/COFF/DriverUtils.cpp

Modified: lld/trunk/COFF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=240901&r1=240900&r2=240901&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.cpp (original)
+++ lld/trunk/COFF/Driver.cpp Sat Jun 27 22:05:38 2015
@@ -233,7 +233,7 @@ bool LinkerDriver::link(llvm::ArrayRef<c
     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;

Modified: lld/trunk/COFF/Driver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.h?rev=240901&r1=240900&r2=240901&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.h (original)
+++ lld/trunk/COFF/Driver.h Sat Jun 27 22:05:38 2015
@@ -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 *>>

Modified: lld/trunk/COFF/DriverUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/DriverUtils.cpp?rev=240901&r1=240900&r2=240901&view=diff
==============================================================================
--- lld/trunk/COFF/DriverUtils.cpp (original)
+++ lld/trunk/COFF/DriverUtils.cpp Sat Jun 27 22:05:38 2015
@@ -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
 }
 
 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);
 }