diff --git a/bindings/go/llvm/DIBuilderBindings.cpp b/bindings/go/llvm/DIBuilderBindings.cpp
index aff81dcea11..5db92427bc0 100644
--- a/bindings/go/llvm/DIBuilderBindings.cpp
+++ b/bindings/go/llvm/DIBuilderBindings.cpp
@@ -83,15 +83,15 @@ LLVMMetadataRef LLVMDIBuilderCreateFunction(
       ScopeLine, static_cast<DINode::DIFlags>(Flags), IsOptimized));
 }
 
-LLVMMetadataRef
-LLVMDIBuilderCreateAutoVariable(LLVMDIBuilderRef Dref, LLVMMetadataRef Scope,
-                                const char *Name, LLVMMetadataRef File,
-                                unsigned Line, LLVMMetadataRef Ty,
-                                int AlwaysPreserve, unsigned Flags) {
+LLVMMetadataRef LLVMDIBuilderCreateAutoVariable(
+    LLVMDIBuilderRef Dref, LLVMMetadataRef Scope, const char *Name,
+    LLVMMetadataRef File, unsigned Line, LLVMMetadataRef Ty, int AlwaysPreserve,
+    unsigned Flags, uint32_t AlignInBits) {
   DIBuilder *D = unwrap(Dref);
-  return wrap(D->createAutoVariable(
-      unwrap<DIScope>(Scope), Name, unwrap<DIFile>(File), Line,
-      unwrap<DIType>(Ty), AlwaysPreserve, static_cast<DINode::DIFlags>(Flags)));
+  return wrap(
+      D->createAutoVariable(unwrap<DIScope>(Scope), Name, unwrap<DIFile>(File),
+                            Line, unwrap<DIType>(Ty), AlwaysPreserve,
+                            static_cast<DINode::DIFlags>(Flags), AlignInBits));
 }
 
 LLVMMetadataRef LLVMDIBuilderCreateParameterVariable(
@@ -107,10 +107,9 @@ LLVMMetadataRef LLVMDIBuilderCreateParameterVariable(
 LLVMMetadataRef LLVMDIBuilderCreateBasicType(LLVMDIBuilderRef Dref,
                                              const char *Name,
                                              uint64_t SizeInBits,
-                                             uint32_t AlignInBits,
                                              unsigned Encoding) {
   DIBuilder *D = unwrap(Dref);
-  return wrap(D->createBasicType(Name, SizeInBits, AlignInBits, Encoding));
+  return wrap(D->createBasicType(Name, SizeInBits, Encoding));
 }
 
 LLVMMetadataRef LLVMDIBuilderCreatePointerType(LLVMDIBuilderRef Dref,
diff --git a/bindings/go/llvm/DIBuilderBindings.h b/bindings/go/llvm/DIBuilderBindings.h
index df71e5d51b3..dee88217fd3 100644
--- a/bindings/go/llvm/DIBuilderBindings.h
+++ b/bindings/go/llvm/DIBuilderBindings.h
@@ -57,11 +57,10 @@ LLVMMetadataRef LLVMDIBuilderCreateFunction(
     LLVMMetadataRef CompositeType, int IsLocalToUnit, int IsDefinition,
     unsigned ScopeLine, unsigned Flags, int IsOptimized);
 
-LLVMMetadataRef
-LLVMDIBuilderCreateAutoVariable(LLVMDIBuilderRef D, LLVMMetadataRef Scope,
-                                const char *Name, LLVMMetadataRef File,
-                                unsigned Line, LLVMMetadataRef Ty,
-                                int AlwaysPreserve, unsigned Flags);
+LLVMMetadataRef LLVMDIBuilderCreateAutoVariable(
+    LLVMDIBuilderRef D, LLVMMetadataRef Scope, const char *Name,
+    LLVMMetadataRef File, unsigned Line, LLVMMetadataRef Ty, int AlwaysPreserve,
+    unsigned Flags, uint32_t AlignInBits);
 
 LLVMMetadataRef LLVMDIBuilderCreateParameterVariable(
     LLVMDIBuilderRef D, LLVMMetadataRef Scope, const char *Name, unsigned ArgNo,
@@ -71,7 +70,6 @@ LLVMMetadataRef LLVMDIBuilderCreateParameterVariable(
 LLVMMetadataRef LLVMDIBuilderCreateBasicType(LLVMDIBuilderRef D,
                                              const char *Name,
                                              uint64_t SizeInBits,
-                                             uint32_t AlignInBits,
                                              unsigned Encoding);
 
 LLVMMetadataRef LLVMDIBuilderCreatePointerType(LLVMDIBuilderRef D,
diff --git a/bindings/go/llvm/dibuilder.go b/bindings/go/llvm/dibuilder.go
index 01b826bd555..56a0a8a576f 100644
--- a/bindings/go/llvm/dibuilder.go
+++ b/bindings/go/llvm/dibuilder.go
@@ -222,6 +222,7 @@ type DIAutoVariable struct {
 	Type           Metadata
 	AlwaysPreserve bool
 	Flags          int
+	AlignInBits    uint32
 }
 
 // CreateAutoVariable creates local variable debug metadata.
@@ -237,6 +238,7 @@ func (d *DIBuilder) CreateAutoVariable(scope Metadata, v DIAutoVariable) Metadat
 		v.Type.C,
 		boolToCInt(v.AlwaysPreserve),
 		C.unsigned(v.Flags),
+		C.uint32_t(v.AlignInBits),
 	)
 	return Metadata{C: result}
 }
@@ -275,10 +277,9 @@ func (d *DIBuilder) CreateParameterVariable(scope Metadata, v DIParameterVariabl
 
 // DIBasicType holds the values for creating basic type debug metadata.
 type DIBasicType struct {
-	Name        string
-	SizeInBits  uint64
-	AlignInBits uint32
-	Encoding    DwarfTypeEncoding
+	Name       string
+	SizeInBits uint64
+	Encoding   DwarfTypeEncoding
 }
 
 // CreateBasicType creates basic type debug metadata.
@@ -289,7 +290,6 @@ func (d *DIBuilder) CreateBasicType(t DIBasicType) Metadata {
 		d.ref,
 		name,
 		C.uint64_t(t.SizeInBits),
-		C.uint32_t(t.AlignInBits),
 		C.unsigned(t.Encoding),
 	)
 	return Metadata{C: result}