mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 21:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11090 from mitchellh/inferred-ty

Browse Source 
stage2: correct comptime-known inferred alloc type, plus comptime array init sentinels
This commit is contained in:
Andrew Kelley 2022-03-08 20:56:00 -05:00 committed by GitHub
commit 935d208ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Sema.zig
View File

@ -2623,10 +2623,9 @@ fn zirResolveInferredAlloc(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Com
// block so that codegen does not see it.
block.instructions.shrinkRetainingCapacity(block.instructions.items.len - 3);
sema.air_values.items[value_index] = try Value.Tag.decl_ref.create(sema.arena, new_decl);
// Would be nice if we could just assign `bitcast_ty_ref` to
// `air_datas[ptr_inst].ty_pl.ty`, wouldn't it? Alas, that is almost correct,
// except that the pointer is mutable and we need to make it constant here.
air_datas[ptr_inst].ty_pl.ty = try sema.addType(final_ptr_ty);
// if bitcast ty ref needs to be made const, make_ptr_const
// ZIR handles it later, so we can just use the ty ref here.
air_datas[ptr_inst].ty_pl.ty = air_datas[bitcast_inst].ty_op.ty;
return;
}
@ -11828,21 +11827,16 @@ fn zirArrayInit(
});
};
const elems = if (!is_sent)
resolved_args
else
resolved_args[0 .. resolved_args.len - 1];
const opt_runtime_src: ?LazySrcLoc = for (elems) |arg| {
const opt_runtime_src: ?LazySrcLoc = for (resolved_args) |arg| {
const arg_src = src; // TODO better source location
const comptime_known = try sema.isComptimeKnown(block, arg_src, arg);
if (!comptime_known) break arg_src;
} else null;
const runtime_src = opt_runtime_src orelse {
const elem_vals = try sema.arena.alloc(Value, elems.len);
const elem_vals = try sema.arena.alloc(Value, resolved_args.len);
for (elems) |arg, i| {
for (resolved_args) |arg, i| {
// We checked that all args are comptime above.
elem_vals[i] = (sema.resolveMaybeUndefVal(block, src, arg) catch unreachable).?;
}
@ -11869,7 +11863,7 @@ fn zirArrayInit(
});
const elem_ptr_ty_ref = try sema.addType(elem_ptr_ty);
for (elems) |arg, i| {
for (resolved_args) |arg, i| {
const index = try sema.addIntUnsigned(Type.usize, i);
const elem_ptr = try block.addPtrElemPtrTypeRef(alloc, index, elem_ptr_ty_ref);
_ = try block.addBinOp(.store, elem_ptr, arg);
@ -11877,7 +11871,7 @@ fn zirArrayInit(
return alloc;
}
return block.addAggregateInit(array_ty, elems);
return block.addAggregateInit(array_ty, resolved_args);
}
fn zirArrayInitAnon(

18
test/behavior/pointers.zig
View File

@ -317,7 +317,11 @@ test "allow any sentinel" {
}
test "pointer sentinel with enums" {
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
const S = struct {
const Number = enum {
@ -336,7 +340,11 @@ test "pointer sentinel with enums" {
}
test "pointer sentinel with optional element" {
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
const S = struct {
fn doTheTest() !void {
@ -349,7 +357,11 @@ test "pointer sentinel with optional element" {
}
test "pointer sentinel with +inf" {
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
const S = struct {
fn doTheTest() !void {