commit fac687de5610ff0f726249982dfb4fdbd3dcd995
author Than McIntosh <thanm@google.com> Wed Apr 11 16:00:49 2018 -0400
committer Than McIntosh <thanm@google.com> Wed Apr 11 20:14:22 2018 +0000
tree afab4badbe06aca46289f1ade0387eada31fe162
parent 64f09124254681c2b553c7b39d0c1a799578edf8

gollvm: update for LLVM trunk r329840

Change to accommodate file rename (CommandFlags.def -> CommandFlags.inc)
and new signatured for IRBuilder::CreateMemCpy.

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

bridge/go-llvm-bfunction.cpp

diff --git a/bridge/go-llvm-bfunction.cpp b/bridge/go-llvm-bfunction.cpp
index ab72a5a..052c6f5 100644
--- a/bridge/go-llvm-bfunction.cpp
+++ b/bridge/go-llvm-bfunction.cpp
@@ -501,7 +501,7 @@
     BlockLIRBuilder bbuilder(function(), inamegen);
     uint64_t sz = tm->typeSize(fcnType_->resultType());
     uint64_t algn = tm->typeAlignment(fcnType_->resultType());
-    bbuilder.CreateMemCpy(rtnValueMem_, toRet->value(), sz, algn);
+    bbuilder.CreateMemCpy(rtnValueMem_, algn, toRet->value(), algn, sz);
     std::vector<llvm::Instruction*> instructions = bbuilder.instructions();
     for (auto i : instructions)
       retInstrs->appendInstruction(i);

bridge/go-llvm.cpp

diff --git a/bridge/go-llvm.cpp b/bridge/go-llvm.cpp
index f720769..547990c 100644
--- a/bridge/go-llvm.cpp
+++ b/bridge/go-llvm.cpp
@@ -737,7 +737,7 @@
   unsigned algn = typeAlignment(srcType);
 
   // Q: should we be using memmove here instead?
-  llvm::CallInst *call = builder->CreateMemCpy(dstLoc, srcVal, sz, algn);
+  llvm::CallInst *call = builder->CreateMemCpy(dstLoc, algn, srcVal, algn, sz);
 
   return call;
 }

driver/llvm-goc.cpp

diff --git a/driver/llvm-goc.cpp b/driver/llvm-goc.cpp
index 7816567..22eb0ca 100644
--- a/driver/llvm-goc.cpp
+++ b/driver/llvm-goc.cpp
@@ -22,7 +22,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/CodeGen/CommandFlags.def"
+#include "llvm/CodeGen/CommandFlags.inc"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/IR/LLVMContext.h"