commit 32112708424282c310f19ef80a2e3480334a1253
author Meador Inge <meadori@codesourcery.com> Tue Dec 06 04:00:12 2016 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Sep 03 12:36:46 2020 -0700
tree 40a5e8901668cc07565eeb1eb78988968cdc83fb
parent 37e8b58d8c8897c0c997a4af605de3cf5e25fad3

[llgo] Fix `debug` to use latest `DIBuilder` bindings

Two recent commits to the LLVM Go bindings caused breaking changes
to llgo:

  1. r284707 - Moving the `AlignInBits` field from `DIBasicType` to
               `DIAutoVariable`.

  2. r284482 - The `AlignInBits` fields going from `uint64` to `uint32`.

This commit updates llgo accordingly.

llvm-svn: 288768
GitOrigin-RevId: 7695d8996f5570b178429b06b48155b35047736c

debug/debug.go

diff --git a/debug/debug.go b/debug/debug.go
index cf5f40b..4331c9c 100644
--- a/debug/debug.go
+++ b/debug/debug.go
@@ -250,14 +250,12 @@
 		return d.builder.CreateBasicType(llvm.DIBasicType{
 			Name:        name,
 			SizeInBits:  uint64(d.sizes.Sizeof(t) * 8),
-			AlignInBits: uint64(d.sizes.Alignof(t) * 8),
 			Encoding:    llvm.DW_ATE_unsigned,
 		})
 	default:
 		bt := llvm.DIBasicType{
 			Name:        t.String(),
 			SizeInBits:  uint64(d.sizes.Sizeof(t) * 8),
-			AlignInBits: uint64(d.sizes.Alignof(t) * 8),
 		}
 		switch bi := t.Info(); {
 		case bi&types.IsBoolean != 0:
@@ -283,7 +281,7 @@
 	return d.builder.CreatePointerType(llvm.DIPointerType{
 		Pointee:     d.DIType(t.Elem()),
 		SizeInBits:  uint64(d.sizes.Sizeof(t) * 8),
-		AlignInBits: uint64(d.sizes.Alignof(t) * 8),
+		AlignInBits: uint32(d.sizes.Alignof(t) * 8),
 	})
 }
 
@@ -301,7 +299,7 @@
 			Name:         f.Name(),
 			Type:         d.DIType(t),
 			SizeInBits:   uint64(d.sizes.Sizeof(t) * 8),
-			AlignInBits:  uint64(d.sizes.Alignof(t) * 8),
+			AlignInBits:  uint32(d.sizes.Alignof(t) * 8),
 			OffsetInBits: uint64(offsets[i] * 8),
 		})
 	}
@@ -309,7 +307,7 @@
 	return d.builder.CreateStructType(d.cu, llvm.DIStructType{
 		Name:        name,
 		SizeInBits:  uint64(d.sizes.Sizeof(t) * 8),
-		AlignInBits: uint64(d.sizes.Alignof(t) * 8),
+		AlignInBits: uint32(d.sizes.Alignof(t) * 8),
 		Elements:    members,
 	})
 }
@@ -345,7 +343,7 @@
 func (d *DIBuilder) descriptorArray(t *types.Array, name string) llvm.Metadata {
 	return d.builder.CreateArrayType(llvm.DIArrayType{
 		SizeInBits:  uint64(d.sizes.Sizeof(t) * 8),
-		AlignInBits: uint64(d.sizes.Alignof(t) * 8),
+		AlignInBits: uint32(d.sizes.Alignof(t) * 8),
 		ElementType: d.DIType(t.Elem()),
 		Subscripts:  []llvm.DISubrange{{Count: t.Len()}},
 	})