Skip to content

Basic: use new signature for ExecuteNoWait #19056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2018
Merged

Basic: use new signature for ExecuteNoWait #19056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/Basic/Default/TaskQueue.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

#include "swift/Basic/LLVM.h"

#include "llvm/ADT/StringExtras.h"

using namespace llvm::sys;

namespace swift {
Expand Down Expand Up @@ -92,13 +94,15 @@ bool TaskQueue::execute(TaskBeganCallback Began, TaskFinishedCallback Finished,
SmallVector<const char *, 128> Argv;
Argv.push_back(T->ExecPath);
Argv.append(T->Args.begin(), T->Args.end());
Argv.push_back(0);
Argv.push_back(nullptr);

const char *const *envp = T->Env.empty() ? nullptr : T->Env.data();
llvm::Optional<llvm::ArrayRef<llvm::StringRef>> Envp =
T->Env.empty() ? decltype(Envp)(None)
: decltype(Envp)(llvm::toStringRefArray(T->Env.data()));

bool ExecutionFailed = false;
ProcessInfo PI = ExecuteNoWait(T->ExecPath, Argv.data(),
(const char **)envp,
ProcessInfo PI = ExecuteNoWait(T->ExecPath,
llvm::toStringRefArray(Argv.data()), Envp,
/*redirects*/None, /*memoryLimit*/0,
/*ErrMsg*/nullptr, &ExecutionFailed);
if (ExecutionFailed) {
Expand Down