Ensure that the arguments passed to sys::Program::ExecuteAndWait include

[oota-llvm.git] / tools / llvmc / CompilerDriver.cpp

diff --git a/tools/llvmc/CompilerDriver.cpp b/tools/llvmc/CompilerDriver.cpp
index 6846fbc62e83445c0a7650d4fa34a6100d52f9de..1a316c84390bbb471b9f35ede6495096a50257f1 100644 (file)
--- a/tools/llvmc/CompilerDriver.cpp
+++ b/tools/llvmc/CompilerDriver.cpp
@@ -394,22 +394,21 @@ private:
 
       // Invoke the program
       const char** Args = (const char**) 
-        alloca(sizeof(const char*)*action->args.size());
-      for (unsigned i = 0; i != action->args.size(); ++i) {
+        alloca(sizeof(const char*)*(action->args.size()+2));
+      Args[0] = action->program.toString().c_str();
+      for (unsigned i = 1; i != action->args.size(); ++i)
         Args[i] = action->args[i].c_str();
-      }
+      Args[action->args.size()] = 0;  // null terminate list.
       if (isSet(TIME_ACTIONS_FLAG)) {
         Timer timer(action->program.toString());
         timer.startTimer();
-        int resultCode = 
-          sys::Program::ExecuteAndWait(action->program,Args);
+        int resultCode = sys::Program::ExecuteAndWait(action->program, Args);
         timer.stopTimer();
         timer.print(timer,std::cerr);
         return resultCode == 0;
       }
       else
-        return 0 == 
-          sys::Program::ExecuteAndWait(action->program, Args);
+        return 0 == sys::Program::ExecuteAndWait(action->program, Args);
     }
     return true;
   }