authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-14 21:22:01-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-14 22:26:11-07:00
log8c14d170b579e078ff961973e4d28a4946df36d7
tree63d2c4d8eaeaa1ae08eac8438d26982f25ddf4b1
parent9c136be78fcc44d4dd4902605de6af14358c67a3

Revert "stage2 llvm: Use unpacked struct for unions and arrays"

This reverts commit 2eaef84ebe968224b0cf25206abf12ea1c5e0f5a. Here is a motivating example: ```zig const E = union(enum) { A: [9]u8, B: u64, }; ``` ```llvm %test2.E = type { { i64, [1 x i8] }, i1, [6 x i8] } ``` ``` error(codegen): when lowering test2.E, Zig ABI size = 16 but LLVM ABI size = 24 ```

1 files changed, 5 insertions(+), 5 deletions(-)

src/codegen/llvm.zig+5-5
......@@ -2734,7 +2734,7 @@ pub const DeclGen = struct {
27342734 llvm_aligned_field_ty,
27352735 dg.context.intType(8).arrayType(padding_len),
27362736 };
2737 break :t dg.context.structType(&fields, fields.len, .False);
2737 break :t dg.context.structType(&fields, fields.len, .True);
27382738 };
27392739
27402740 if (layout.tag_size == 0) {
......@@ -3050,7 +3050,7 @@ pub const DeclGen = struct {
30503050 return dg.context.constStruct(
30513051 llvm_elems.ptr,
30523052 @intCast(c_uint, llvm_elems.len),
3053 .False,
3053 .True,
30543054 );
30553055 } else {
30563056 const llvm_elem_ty = try dg.lowerType(elem_ty);
......@@ -3087,7 +3087,7 @@ pub const DeclGen = struct {
30873087 return dg.context.constStruct(
30883088 llvm_elems.ptr,
30893089 @intCast(c_uint, llvm_elems.len),
3090 .False,
3090 .True,
30913091 );
30923092 } else {
30933093 const llvm_elem_ty = try dg.lowerType(elem_ty);
......@@ -3104,7 +3104,7 @@ pub const DeclGen = struct {
31043104 const llvm_elems: [1]*const llvm.Value = .{sentinel};
31053105 const need_unnamed = dg.isUnnamedType(elem_ty, llvm_elems[0]);
31063106 if (need_unnamed) {
3107 return dg.context.constStruct(&llvm_elems, llvm_elems.len, .False);
3107 return dg.context.constStruct(&llvm_elems, llvm_elems.len, .True);
31083108 } else {
31093109 const llvm_elem_ty = try dg.lowerType(elem_ty);
31103110 return llvm_elem_ty.constArray(&llvm_elems, llvm_elems.len);
......@@ -3397,7 +3397,7 @@ pub const DeclGen = struct {
33973397 const fields: [2]*const llvm.Value = .{
33983398 field, dg.context.intType(8).arrayType(padding_len).getUndef(),
33993399 };
3400 break :p dg.context.constStruct(&fields, fields.len, .False);
3400 break :p dg.context.constStruct(&fields, fields.len, .True);
34013401 };
34023402
34033403 if (layout.tag_size == 0) {