mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sema: update zirSliceLength to avoid resolveInst(.none)

Browse source
This commit is contained in:
Andrew Kelley 2023-05-23 19:19:13 -07:00
parent 01ca841f12
commit 2052260039
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Sema.zig
View file

@ -10088,7 +10088,7 @@ fn zirSliceLength(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
const array_ptr = try sema.resolveInst(extra.lhs); const array_ptr = try sema.resolveInst(extra.lhs);
const start = try sema.resolveInst(extra.start); const start = try sema.resolveInst(extra.start);
const len = try sema.resolveInst(extra.len); const len = try sema.resolveInst(extra.len);
const sentinel = try sema.resolveInst(extra.sentinel); const sentinel = if (extra.sentinel == .none) .none else try sema.resolveInst(extra.sentinel);
const ptr_src: LazySrcLoc = .{ .node_offset_slice_ptr = inst_data.src_node }; const ptr_src: LazySrcLoc = .{ .node_offset_slice_ptr = inst_data.src_node };
const start_src: LazySrcLoc = .{ .node_offset_slice_start = extra.start_src_node_offset }; const start_src: LazySrcLoc = .{ .node_offset_slice_start = extra.start_src_node_offset };
const end_src: LazySrcLoc = .{ .node_offset_slice_end = inst_data.src_node }; const end_src: LazySrcLoc = .{ .node_offset_slice_end = inst_data.src_node };
@ -31997,17 +31997,14 @@ pub fn resolveTypeFully(sema: *Sema, ty: Type) CompileError!void {
const child_ty = try sema.resolveTypeFields(ty.childType(mod)); const child_ty = try sema.resolveTypeFields(ty.childType(mod));
return sema.resolveTypeFully(child_ty); return sema.resolveTypeFully(child_ty);
}, },
.Struct => switch (ty.ip_index) { .Struct => switch (mod.intern_pool.indexToKey(ty.ip_index)) {
.none => {}, // TODO make this unreachable when all types are migrated to InternPool .struct_type => return sema.resolveStructFully(ty),
else => switch (mod.intern_pool.indexToKey(ty.ip_index)) { .anon_struct_type => |tuple| {
.struct_type => return sema.resolveStructFully(ty), for (tuple.types) |field_ty| {
.anon_struct_type => |tuple| { try sema.resolveTypeFully(field_ty.toType());
for (tuple.types) |field_ty| { }
try sema.resolveTypeFully(field_ty.toType());
}
},
else => {},
}, },
else => {},
}, },
.Union => return sema.resolveUnionFully(ty), .Union => return sema.resolveUnionFully(ty),
.Array => return sema.resolveTypeFully(ty.childType(mod)), .Array => return sema.resolveTypeFully(ty.childType(mod)),
@ -32096,8 +32093,7 @@ pub fn resolveTypeFields(sema: *Sema, ty: Type) CompileError!Type {
switch (ty.ip_index) { switch (ty.ip_index) {
.var_args_param_type => unreachable, .var_args_param_type => unreachable,
// TODO: After the InternPool transition is complete, change this to `unreachable`. .none => unreachable,
.none => return ty,
.u1_type, .u1_type,
.u8_type, .u8_type,