From 847e36fb60ed4c9fa08215df4fddbe085bbad87a Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Tue, 26 Mar 2013 23:35:00 +0000 Subject: [PATCH] Add a boolean parameter to the ExecuteAndWait static function to indicated if execution failed. ExecuteAndWait returns -1 upon an execution failure, but checking the return value isn't sufficient because the wait command may return -1 as well. This new parameter is to be used by the clang driver in a subsequent commit. Part of rdar://13362359 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178087 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Program.h | 3 ++- lib/Support/Program.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/llvm/Support/Program.h b/include/llvm/Support/Program.h index a0cc27c0241..bf650112f28 100644 --- a/include/llvm/Support/Program.h +++ b/include/llvm/Support/Program.h @@ -125,7 +125,8 @@ namespace sys { const sys::Path** redirects = 0, unsigned secondsToWait = 0, unsigned memoryLimit = 0, - std::string* ErrMsg = 0); + std::string* ErrMsg = 0, + bool *ExecutionFailed = 0); /// A convenience function equivalent to Program prg; prg.Execute(..); /// @see Execute diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp index 75bc282d9bd..201d5c0d305 100644 --- a/lib/Support/Program.cpp +++ b/lib/Support/Program.cpp @@ -29,12 +29,15 @@ Program::ExecuteAndWait(const Path& path, const Path** redirects, unsigned secondsToWait, unsigned memoryLimit, - std::string* ErrMsg) { + std::string* ErrMsg, + bool *ExecutionFailed) { Program prg; - if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg)) + if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg)) { + if (ExecutionFailed) *ExecutionFailed = false; return prg.Wait(path, secondsToWait, ErrMsg); - else - return -1; + } + if (ExecutionFailed) *ExecutionFailed = true; + return -1; } void