compiler: switch to CreateInBoundsGEP

Author: dgryski

compiler/map.go

@@ -275,6 +275,8 @@ func (b *builder) zeroUndefBytes(llvmType llvm.Type, ptr llvm.Value) error {
 	// we handle nested types.  Next, we determine if there are any padding bytes before the next
 	// element and zero those as well.
 
+	zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
+
 	switch llvmType.TypeKind() {
 	case llvm.IntegerTypeKind:
 		// no padding bytes
@@ -286,9 +288,11 @@ func (b *builder) zeroUndefBytes(llvmType llvm.Type, ptr llvm.Value) error {
 		llvmArrayType := llvmType
 		llvmElemType := llvmType.ElementType()
 
+		zero := llvm.ConstInt(b.ctx.Int32Type(), 0, false)
+
 		for i := 0; i < llvmArrayType.ArrayLength(); i++ {
 			idx := llvm.ConstInt(b.uintptrType, uint64(i), false)
-			elemPtr := b.CreateGEP(llvmArrayType, ptr, []llvm.Value{idx}, "")
+			elemPtr := b.CreateInBoundsGEP(llvmArrayType, ptr, []llvm.Value{zero, idx}, "")
 
 			// zero any padding bytes in this element
 			b.zeroUndefBytes(llvmElemType, elemPtr)
@@ -300,21 +304,22 @@ func (b *builder) zeroUndefBytes(llvmType llvm.Type, ptr llvm.Value) error {
 		llvmElementTypes := llvmStructType.StructElementTypes()
 
 		for i := 0; i < llvmStructType.StructElementTypesCount(); i++ {
-			offset := b.targetData.ElementOffset(llvmStructType, i)
-			llvmOffset := llvm.ConstInt(b.uintptrType, offset, false)
-			elemPtr := b.CreateGEP(b.ctx.Int8Type(), ptr, []llvm.Value{llvmOffset}, "")
+			idx := llvm.ConstInt(b.ctx.Int32Type(), uint64(i), false)
+			elemPtr := b.CreateInBoundsGEP(llvmType, ptr, []llvm.Value{zero, idx}, "")
 
 			// zero any padding bytes in this field
 			llvmElemType := llvmElementTypes[i]
 			b.zeroUndefBytes(llvmElemType, elemPtr)
 
 			// zero any padding bytes before the next field, if any
 			if i < numFields-1 {
+				offset := b.targetData.ElementOffset(llvmStructType, i)
 				nextOffset := b.targetData.ElementOffset(llvmStructType, i+1)
 				if storeSize := b.targetData.TypeStoreSize(llvmElemType); offset+storeSize != nextOffset {
 					n := llvm.ConstInt(b.uintptrType, nextOffset-(offset+storeSize), false)
-					llvmSize := llvm.ConstInt(b.uintptrType, storeSize, false)
-					paddingStart := b.CreateGEP(b.ctx.Int8Type(), elemPtr, []llvm.Value{llvmSize}, "")
+					llvmStoreSize := llvm.ConstInt(b.uintptrType, storeSize, false)
+					elemPtr = b.CreateBitCast(elemPtr, b.i8ptrType, "")
+					paddingStart := b.CreateInBoundsGEP(b.i8ptrType, elemPtr, []llvm.Value{llvmStoreSize}, "")
 					b.createRuntimeCall("memzero", []llvm.Value{paddingStart, n}, "")
 				}
 			}
@@ -327,8 +332,8 @@ func (b *builder) zeroUndefBytes(llvmType llvm.Type, ptr llvm.Value) error {
 
 		if allocSize != lastElemOffset+lastElemStore {
 			n := llvm.ConstInt(b.uintptrType, allocSize-(lastElemOffset+lastElemStore), false)
-			llvmSize := llvm.ConstInt(b.uintptrType, lastElemOffset+lastElemStore, false)
-			paddingStart := b.CreateGEP(b.ctx.Int8Type(), ptr, []llvm.Value{llvmSize}, "")
+			llvmStoreSize := llvm.ConstInt(b.uintptrType, lastElemOffset+lastElemStore, false)
+			paddingStart := b.CreateInBoundsGEP(b.ctx.Int8Type(), ptr, []llvm.Value{llvmStoreSize}, "")
 			b.createRuntimeCall("memzero", []llvm.Value{paddingStart, n}, "")
 		}
 	}