Commit a2a5d3c2885cacf16d55d7943d10a81a5dc31b8a | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-03-15 00:40:32-04:00
committer	GitHub <noreply@github.com> 2022-03-15 00:40:32-04:00
log	a2a5d3c2885cacf16d55d7943d10a81a5dc31b8a
tree	1061a7063f360df1f547a959ca174bda4d9db02f
parent	c757f197903940115c1d42883240ec1fe7ef660c
parent	67647154c1c307dcf34413d013e6cd4a1df81945
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #11167 from mitchellh/codegen-arrays

stage2: codegen of arrays should use type length, not value length

4 files changed, 60 insertions(+), 21 deletions(-)

src
- codegen.zig
- codegen
  - llvm.zig
test
- behavior.zig
- behavior
  - bugs
    11165.zig

src/codegen.zig+7-18

 @@ -207,29 +207,18 @@ pub fn generateSymbol(
             .bytes => {
                 // TODO populate .debug_info for the array
                 const payload = typed_value.val.castTag(.bytes).?;
-                if (typed_value.ty.sentinel()) |sentinel| {
+                const len = @intCast(usize, typed_value.ty.arrayLenIncludingSentinel());
-                    try code.ensureUnusedCapacity(payload.data.len + 1);
+                // The bytes payload already includes the sentinel, if any
-                    code.appendSliceAssumeCapacity(payload.data);
+                try code.ensureUnusedCapacity(len);
-                    switch (try generateSymbol(bin_file, src_loc, .{
+                code.appendSliceAssumeCapacity(payload.data[0..len]);
-                        .ty = typed_value.ty.elemType(),
+                return Result{ .appended = {} };
-                        .val = sentinel,
-                    }, code, debug_output, reloc_info)) {
-                        .appended => return Result{ .appended = {} },
-                        .externally_managed => |slice| {
-                            code.appendSliceAssumeCapacity(slice);
-                            return Result{ .appended = {} };
-                        },
-                        .fail => |em| return Result{ .fail = em },
-                    }
-                } else {
-                    return Result{ .externally_managed = payload.data };
-                }
             },
             .aggregate => {
                 // TODO populate .debug_info for the array
                 const elem_vals = typed_value.val.castTag(.aggregate).?.data;
                 const elem_ty = typed_value.ty.elemType();
-                for (elem_vals) |elem_val| {
+                const len = @intCast(usize, typed_value.ty.arrayLenIncludingSentinel());
+                for (elem_vals[0..len]) |elem_val| {
                     switch (try generateSymbol(bin_file, src_loc, .{
                         .ty = elem_ty,
                         .val = elem_val,

src/codegen/llvm.zig+4-3

 @@ -1550,7 +1550,7 @@ pub const DeclGen = struct {
                     const bytes = tv.val.castTag(.bytes).?.data;
                     return dg.context.constString(
                         bytes.ptr,
-                        @intCast(c_uint, bytes.len),
+                        @intCast(c_uint, tv.ty.arrayLenIncludingSentinel()),
                         .True, // don't null terminate. bytes has the sentinel, if any.
                     );
                 },
 @@ -1558,10 +1558,11 @@ pub const DeclGen = struct {
                     const elem_vals = tv.val.castTag(.aggregate).?.data;
                     const elem_ty = tv.ty.elemType();
                     const gpa = dg.gpa;
-                    const llvm_elems = try gpa.alloc(*const llvm.Value, elem_vals.len);
+                    const len = @intCast(usize, tv.ty.arrayLenIncludingSentinel());
+                    const llvm_elems = try gpa.alloc(*const llvm.Value, len);
                     defer gpa.free(llvm_elems);
                     var need_unnamed = false;
-                    for (elem_vals) |elem_val, i| {
+                    for (elem_vals[0..len]) |elem_val, i| {
                         llvm_elems[i] = try dg.genTypedValue(.{ .ty = elem_ty, .val = elem_val });
                         need_unnamed = need_unnamed or dg.isUnnamedType(elem_ty, llvm_elems[i]);
                     }

test/behavior.zig+1

...	@@ -62,6 +62,7 @@ test {	...	@@ -62,6 +62,7 @@ test {
62	_ = @import("behavior/bugs/11100.zig");	62	_ = @import("behavior/bugs/11100.zig");
63	_ = @import("behavior/bugs/10970.zig");	63	_ = @import("behavior/bugs/10970.zig");
64	_ = @import("behavior/bugs/11046.zig");	64	_ = @import("behavior/bugs/11046.zig");
		65	_ = @import("behavior/bugs/11165.zig");
65	_ = @import("behavior/call.zig");	66	_ = @import("behavior/call.zig");
66	_ = @import("behavior/cast.zig");	67	_ = @import("behavior/cast.zig");
67	_ = @import("behavior/comptime_memory.zig");	68	_ = @import("behavior/comptime_memory.zig");

test/behavior/bugs/11165.zig created+48

...	@@ -0,0 +1,48 @@
1	const builtin = @import("builtin");
2
3	test "bytes" {
4	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
5	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
6
7	const S = struct {
8	a: u32,
9	c: [5]u8,
10	};
11
12	const U = union {
13	s: S,
14	};
15
16	const s_1 = S{
17	.a = undefined,
18	.c = "12345".*, // this caused problems
19	};
20	_ = s_1;
21
22	var u_2 = U{ .s = s_1 };
23	_ = u_2;
24	}
25
26	test "aggregate" {
27	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
28	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
29
30	const S = struct {
31	a: u32,
32	c: [5]u8,
33	};
34
35	const U = union {
36	s: S,
37	};
38
39	const c = [5:0]u8{ 1, 2, 3, 4, 5 };
40	const s_1 = S{
41	.a = undefined,
42	.c = c, // this caused problems
43	};
44	_ = s_1;
45
46	var u_2 = U{ .s = s_1 };
47	_ = u_2;
48	}