Revert r190902 and r190906

The first one broke the build, and the latter one made it worse.

llvm-svn: 190907

1 files changed, 3 insertions, 2 deletions

diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp
index 4e4c664c8f7..0a783eb93b1 100644
--- a/clang/lib/Driver/Job.cpp
+++ b/clang/lib/Driver/Job.cpp
@@ -21,7 +21,8 @@ using llvm::StringRef;
 Job::~Job() {}
 
 Command::Command(const Action &_Source, const Tool &_Creator,
-                 const char *_Executable, const ArgStringList &_Arguments)
+                 const char *_Executable,
+                 const llvm::opt::ArgStringList &_Arguments)
     : Job(CommandClass), Source(_Source), Creator(_Creator),
       Executable(_Executable), Arguments(_Arguments) {}
 
@@ -112,7 +113,7 @@ void Command::Print(raw_ostream &OS, const char *Terminator, bool Quote,
   OS << Terminator;
 }
 
-int Command::Execute(const StringRef **Redirects, std::string *ErrMsg,
+int Command::Execute(const llvm::StringRef **Redirects, std::string *ErrMsg,
                      bool *ExecutionFailed) const {
   SmallVector<const char*, 128> Argv;
   Argv.push_back(Executable);