commit c80888e813bfd29512c0da6bc892cffa2cba37d0
author Than McIntosh <thanm@google.com> Wed Jul 11 11:22:57 2018 -0400
committer Than McIntosh <thanm@google.com> Wed Jul 11 16:18:14 2018 +0000
tree c64ada4f7d512a0436aa1666e54f49d2f2f171f0
parent 7352f685d0a4c1b9ae1baeab2480416e8353b757

gollvm: sync with LLVM trunk r336809

Signature for llvm::sys::ExecuteAndWait has changed.

Fixes golang/go#26331.

Change-Id: I67394cbfcb552f4aa251c8ad64ae29c4c9d52cb5
Reviewed-on: https://go-review.googlesource.com/123295
Reviewed-by: Cherry Zhang <cherryyz@google.com>

driver/Command.cpp

diff --git a/driver/Command.cpp b/driver/Command.cpp
index e27114b..2f10e8c 100644
--- a/driver/Command.cpp
+++ b/driver/Command.cpp
@@ -31,9 +31,14 @@
 
 int Command::execute(std::string *errMsg)
 {
+  std::vector<llvm::StringRef> argv;
+  size_t n = arguments_.size() - 1;
+  argv.reserve(n);
+  for (size_t i = 0; i < n; ++i)
+    argv.push_back(arguments_[i]);
   return llvm::sys::ExecuteAndWait(executable_,
-                                   arguments_.data(),
-                                   /*env=*/nullptr,
+                                   argv,
+                                   /*env=*/llvm::None,
                                    /*Redirects*/{},
                                    /*secondsToWait=*/0,
                                    /*memoryLimit=*/0,