authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2024-09-16 17:39:56+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-09-16 17:39:56+01:00
logf3445f8f6935b4532aab3f339f5d86319d2dca72
treecd564962eefa77c38a89b6958e86ebd3bf7fc784
parent5d7fa5513f92a43a418e3c5c4d27f0b61db313ff
parent8ff2f1057a9e9cc258f335e4a26101866be987a9
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21423 from mlugg/field-init-resolution

compiler: always resolve field inits, remove unncecessary eager resolution

3 files changed, 34 insertions(+), 66 deletions(-)

src/Sema.zig+1
......@@ -36337,6 +36337,7 @@ pub fn resolveUnionLayout(sema: *Sema, ty: Type) SemaError!void {
3633736337/// be resolved.
3633836338pub fn resolveStructFully(sema: *Sema, ty: Type) SemaError!void {
3633936339 try sema.resolveStructLayout(ty);
36340 try sema.resolveStructFieldInits(ty);
3634036341
3634136342 const pt = sema.pt;
3634236343 const zcu = pt.zcu;
src/Zcu/PerThread.zig+6-15
......@@ -1240,11 +1240,11 @@ fn semaCau(pt: Zcu.PerThread, cau_index: InternPool.Cau.Index) !SemaCauResult {
12401240 };
12411241 }
12421242
1243 const nav_already_populated, const queue_linker_work, const resolve_type = switch (ip.indexToKey(decl_val.toIntern())) {
1244 .func => |f| .{ f.owner_nav == nav_index, true, false },
1245 .variable => |v| .{ false, v.owner_nav == nav_index, true },
1246 .@"extern" => .{ false, false, false },
1247 else => .{ false, true, true },
1243 const nav_already_populated, const queue_linker_work = switch (ip.indexToKey(decl_val.toIntern())) {
1244 .func => |f| .{ f.owner_nav == nav_index, true },
1245 .variable => |v| .{ false, v.owner_nav == nav_index },
1246 .@"extern" => .{ false, false },
1247 else => .{ false, true },
12481248 };
12491249
12501250 if (nav_already_populated) {
......@@ -1317,16 +1317,7 @@ fn semaCau(pt: Zcu.PerThread, cau_index: InternPool.Cau.Index) !SemaCauResult {
13171317 queue_codegen: {
13181318 if (!queue_linker_work) break :queue_codegen;
13191319
1320 if (resolve_type) {
1321 // Needed for codegen_nav which will call updateDecl and then the
1322 // codegen backend wants full access to the Decl Type.
1323 // We also need this for the `isFnOrHasRuntimeBits` check below.
1324 // TODO: we could make the language more lenient by deferring this work
1325 // to the `codegen_nav` job.
1326 try decl_ty.resolveFully(pt);
1327 }
1328
1329 if (!resolve_type or !decl_ty.hasRuntimeBits(zcu)) {
1320 if (!try decl_ty.hasRuntimeBitsSema(pt)) {
13301321 if (zcu.comp.config.use_llvm) break :queue_codegen;
13311322 if (file.mod.strip) break :queue_codegen;
13321323 }
src/link/Dwarf.zig+27-51
......@@ -2643,10 +2643,8 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
26432643 try uleb128(diw, nav_val.toType().abiAlignment(zcu).toByteUnits().?);
26442644 for (0..loaded_struct.field_types.len) |field_index| {
26452645 const is_comptime = loaded_struct.fieldIsComptime(ip, field_index);
2646 const field_init = if (loaded_struct.haveFieldInits(ip))
2647 loaded_struct.fieldInit(ip, field_index)
2648 else
2649 .none;
2646 const field_init = loaded_struct.fieldInit(ip, field_index);
2647 assert(!(is_comptime and field_init == .none));
26502648 try wip_nav.abbrevCode(if (is_comptime)
26512649 .struct_field_comptime
26522650 else if (field_init != .none)
......@@ -2658,20 +2656,14 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
26582656 defer dwarf.gpa.free(field_name);
26592657 try wip_nav.strp(field_name);
26602658 }
2661 if (is_comptime and field_init == .none) {
2662 // workaround frontend bug
2663 try wip_nav.refType(Type.void);
2664 try wip_nav.blockValue(nav_src_loc, Value.void);
2665 } else {
2666 const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
2667 try wip_nav.refType(field_type);
2668 if (!is_comptime) {
2669 try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
2670 try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
2671 field_type.abiAlignment(zcu).toByteUnits().?);
2672 }
2673 if (field_init != .none) try wip_nav.blockValue(nav_src_loc, Value.fromInterned(field_init));
2659 const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
2660 try wip_nav.refType(field_type);
2661 if (!is_comptime) {
2662 try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
2663 try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
2664 field_type.abiAlignment(zcu).toByteUnits().?);
26742665 }
2666 if (field_init != .none) try wip_nav.blockValue(nav_src_loc, Value.fromInterned(field_init));
26752667 }
26762668 try uleb128(diw, @intFromEnum(AbbrevCode.null));
26772669 }
......@@ -3511,10 +3503,8 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
35113503 try uleb128(diw, ty.abiAlignment(zcu).toByteUnits().?);
35123504 for (0..loaded_struct.field_types.len) |field_index| {
35133505 const is_comptime = loaded_struct.fieldIsComptime(ip, field_index);
3514 const field_init = if (loaded_struct.haveFieldInits(ip))
3515 loaded_struct.fieldInit(ip, field_index)
3516 else
3517 .none;
3506 const field_init = loaded_struct.fieldInit(ip, field_index);
3507 assert(!(is_comptime and field_init == .none));
35183508 try wip_nav.abbrevCode(if (is_comptime)
35193509 .struct_field_comptime
35203510 else if (field_init != .none)
......@@ -3526,20 +3516,14 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
35263516 defer dwarf.gpa.free(field_name);
35273517 try wip_nav.strp(field_name);
35283518 }
3529 if (is_comptime and field_init == .none) {
3530 // workaround frontend bug
3531 try wip_nav.refType(Type.void);
3532 try wip_nav.blockValue(ty_src_loc, Value.void);
3533 } else {
3534 const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
3535 try wip_nav.refType(field_type);
3536 if (!is_comptime) {
3537 try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
3538 try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
3539 field_type.abiAlignment(zcu).toByteUnits().?);
3540 }
3541 if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
3519 const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
3520 try wip_nav.refType(field_type);
3521 if (!is_comptime) {
3522 try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
3523 try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
3524 field_type.abiAlignment(zcu).toByteUnits().?);
35423525 }
3526 if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
35433527 }
35443528 try uleb128(diw, @intFromEnum(AbbrevCode.null));
35453529 }
......@@ -3595,10 +3579,8 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
35953579 try uleb128(diw, ty.abiAlignment(zcu).toByteUnits().?);
35963580 for (0..loaded_struct.field_types.len) |field_index| {
35973581 const is_comptime = loaded_struct.fieldIsComptime(ip, field_index);
3598 const field_init = if (loaded_struct.haveFieldInits(ip))
3599 loaded_struct.fieldInit(ip, field_index)
3600 else
3601 .none;
3582 const field_init = loaded_struct.fieldInit(ip, field_index);
3583 assert(!(is_comptime and field_init == .none));
36023584 try wip_nav.abbrevCode(if (is_comptime)
36033585 .struct_field_comptime
36043586 else if (field_init != .none)
......@@ -3610,20 +3592,14 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
36103592 defer dwarf.gpa.free(field_name);
36113593 try wip_nav.strp(field_name);
36123594 }
3613 if (is_comptime and field_init == .none) {
3614 // workaround frontend bug
3615 try wip_nav.refType(Type.void);
3616 try wip_nav.blockValue(ty_src_loc, Value.void);
3617 } else {
3618 const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
3619 try wip_nav.refType(field_type);
3620 if (!is_comptime) {
3621 try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
3622 try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
3623 field_type.abiAlignment(zcu).toByteUnits().?);
3624 }
3625 if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
3595 const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
3596 try wip_nav.refType(field_type);
3597 if (!is_comptime) {
3598 try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
3599 try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
3600 field_type.abiAlignment(zcu).toByteUnits().?);
36263601 }
3602 if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
36273603 }
36283604 try uleb128(diw, @intFromEnum(AbbrevCode.null));
36293605 }