[PATCH] D56638: [llgo]: Somewhat revive it and make it buildable with current trunk.

[Kristina Brooks via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL351722: [llgo]: fix compilation under current llvm (authored by kristina, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D56638?vs=181444&id=182740#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D56638/new/

https://reviews.llvm.org/D56638

Files:
  llgo/trunk/cmd/gllgo/gllgo.go
  llgo/trunk/irgen/runtime.go


Index: llgo/trunk/irgen/runtime.go
===================================================================
--- llgo/trunk/irgen/runtime.go
+++ llgo/trunk/irgen/runtime.go
@@ -517,7 +517,6 @@
 			llvm.PointerType(llvm.Int8Type(), 0),
 			llvm.Int8Type(),
 			tm.target.IntPtrType(),
-			llvm.Int32Type(),
 			llvm.Int1Type(),
 		},
 		false,
@@ -530,8 +529,7 @@
 		[]llvm.Type{
 			llvm.PointerType(llvm.Int8Type(), 0),
 			llvm.PointerType(llvm.Int8Type(), 0),
-			tm.target.IntPtrType(),
-			llvm.Int32Type(),
+			llvm.Int64Type(),
 			llvm.Int1Type(),
 		},
 		false,
@@ -589,9 +587,8 @@
 	ptr = fr.builder.CreateBitCast(ptr, llvm.PointerType(llvm.Int8Type(), 0), "")
 	fill := llvm.ConstNull(llvm.Int8Type())
 	size = fr.createZExtOrTrunc(size, fr.target.IntPtrType(), "")
-	align := llvm.ConstInt(llvm.Int32Type(), 1, false)
 	isvolatile := llvm.ConstNull(llvm.Int1Type())
-	fr.builder.CreateCall(memset, []llvm.Value{ptr, fill, size, align, isvolatile}, "")
+	fr.builder.CreateCall(memset, []llvm.Value{ptr, fill, size, isvolatile}, "")
 }
 
 func (fr *frame) memcpy(dest llvm.Value, src llvm.Value, size llvm.Value) {
@@ -599,9 +596,8 @@
 	dest = fr.builder.CreateBitCast(dest, llvm.PointerType(llvm.Int8Type(), 0), "")
 	src = fr.builder.CreateBitCast(src, llvm.PointerType(llvm.Int8Type(), 0), "")
 	size = fr.createZExtOrTrunc(size, fr.target.IntPtrType(), "")
-	align := llvm.ConstInt(llvm.Int32Type(), 1, false)
 	isvolatile := llvm.ConstNull(llvm.Int1Type())
-	fr.builder.CreateCall(memcpy, []llvm.Value{dest, src, size, align, isvolatile}, "")
+	fr.builder.CreateCall(memcpy, []llvm.Value{dest, src, size, isvolatile}, "")
 }
 
 func (fr *frame) returnAddress(level uint64) llvm.Value {
Index: llgo/trunk/cmd/gllgo/gllgo.go
===================================================================
--- llgo/trunk/cmd/gllgo/gllgo.go
+++ llgo/trunk/cmd/gllgo/gllgo.go
@@ -117,7 +117,7 @@
 	case san.thread:
 		mpm.AddThreadSanitizerPass()
 	case san.memory:
-		mpm.AddMemorySanitizerPass()
+		mpm.AddMemorySanitizerLegacyPassPass()
 	case san.dataflow:
 		blacklist := san.blacklist
 		if blacklist == "" {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56638.182740.patch
Type: text/x-patch
Size: 2108 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190121/bd9395e2/attachment.bin>