Skip to content

Commit ba62853

Browse files
committed
stage2: sentinel array init must add sentinel to array value
I didn't realize that the `array` value type has the sentinel on it.
1 parent cd32b11 commit ba62853

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

src/Sema.zig

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11827,21 +11827,16 @@ fn zirArrayInit(
1182711827
});
1182811828
};
1182911829

11830-
const elems = if (!is_sent)
11831-
resolved_args
11832-
else
11833-
resolved_args[0 .. resolved_args.len - 1];
11834-
11835-
const opt_runtime_src: ?LazySrcLoc = for (elems) |arg| {
11830+
const opt_runtime_src: ?LazySrcLoc = for (resolved_args) |arg| {
1183611831
const arg_src = src; // TODO better source location
1183711832
const comptime_known = try sema.isComptimeKnown(block, arg_src, arg);
1183811833
if (!comptime_known) break arg_src;
1183911834
} else null;
1184011835

1184111836
const runtime_src = opt_runtime_src orelse {
11842-
const elem_vals = try sema.arena.alloc(Value, elems.len);
11837+
const elem_vals = try sema.arena.alloc(Value, resolved_args.len);
1184311838

11844-
for (elems) |arg, i| {
11839+
for (resolved_args) |arg, i| {
1184511840
// We checked that all args are comptime above.
1184611841
elem_vals[i] = (sema.resolveMaybeUndefVal(block, src, arg) catch unreachable).?;
1184711842
}
@@ -11868,15 +11863,15 @@ fn zirArrayInit(
1186811863
});
1186911864
const elem_ptr_ty_ref = try sema.addType(elem_ptr_ty);
1187011865

11871-
for (elems) |arg, i| {
11866+
for (resolved_args) |arg, i| {
1187211867
const index = try sema.addIntUnsigned(Type.usize, i);
1187311868
const elem_ptr = try block.addPtrElemPtrTypeRef(alloc, index, elem_ptr_ty_ref);
1187411869
_ = try block.addBinOp(.store, elem_ptr, arg);
1187511870
}
1187611871
return alloc;
1187711872
}
1187811873

11879-
return block.addAggregateInit(array_ty, elems);
11874+
return block.addAggregateInit(array_ty, resolved_args);
1188011875
}
1188111876

1188211877
fn zirArrayInitAnon(

test/behavior/pointers.zig

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,11 @@ test "allow any sentinel" {
317317
}
318318

319319
test "pointer sentinel with enums" {
320-
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
320+
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
321+
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
322+
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
323+
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
324+
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
321325

322326
const S = struct {
323327
const Number = enum {
@@ -336,7 +340,11 @@ test "pointer sentinel with enums" {
336340
}
337341

338342
test "pointer sentinel with optional element" {
339-
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
343+
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
344+
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
345+
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
346+
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
347+
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
340348

341349
const S = struct {
342350
fn doTheTest() !void {
@@ -349,7 +357,11 @@ test "pointer sentinel with optional element" {
349357
}
350358

351359
test "pointer sentinel with +inf" {
352-
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
360+
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
361+
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
362+
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
363+
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
364+
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
353365

354366
const S = struct {
355367
fn doTheTest() !void {

0 commit comments

Comments
 (0)