Commit 67647154c1c307dcf34413d013e6cd4a1df81945 | zig

author	Mitchell Hashimoto <mitchell.hashimoto@gmail.com> 2022-03-14 20:00:17-07:00
committer	Mitchell Hashimoto <mitchell.hashimoto@gmail.com> 2022-03-14 20:00:17-07:00
log	67647154c1c307dcf34413d013e6cd4a1df81945
tree	1db0b6fe61fe5dc9c261ca6551115cfd4f782b68
parent	a859f94644cb362d84d3f9d72bc02b00a75fc32a
signature	Commit is signed but in an unrecognized format.

stage2: apply fix for #11165 to codegen.zig for native backends

Co-authored-by: Cody Tapscott <topolarity@tapscott.me>

2 files changed, 15 insertions(+), 20 deletions(-)

src
- codegen.zig
test
- 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,

test/behavior/bugs/11165.zig+8-2

 @@ -1,6 +1,9 @@
 const builtin = @import("builtin");
 test "bytes" {
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     const S = struct {
         a: u32,
         c: [5]u8,
 @@ -16,11 +19,14 @@ test "bytes" {
     };
     _ = s_1;
-    const u_2 = U{ .s = s_1 };
+    var u_2 = U{ .s = s_1 };
     _ = u_2;
 }
 test "aggregate" {
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     const S = struct {
         a: u32,
         c: [5]u8,
 @@ -37,6 +43,6 @@ test "aggregate" {
     };
     _ = s_1;
-    const u_2 = U{ .s = s_1 };
+    var u_2 = U{ .s = s_1 };
     _ = u_2;
 }