aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Sema.zig1
-rw-r--r--src/Zcu/PerThread.zig21
-rw-r--r--src/link/Dwarf.zig78
3 files changed, 34 insertions, 66 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index 7a4b9b3210..559fbe3e53 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -36337,6 +36337,7 @@ pub fn resolveUnionLayout(sema: *Sema, ty: Type) SemaError!void {
/// be resolved.
pub fn resolveStructFully(sema: *Sema, ty: Type) SemaError!void {
try sema.resolveStructLayout(ty);
+ try sema.resolveStructFieldInits(ty);
const pt = sema.pt;
const zcu = pt.zcu;
diff --git a/src/Zcu/PerThread.zig b/src/Zcu/PerThread.zig
index 837895f783..a11910302d 100644
--- a/src/Zcu/PerThread.zig
+++ b/src/Zcu/PerThread.zig
@@ -1240,11 +1240,11 @@ fn semaCau(pt: Zcu.PerThread, cau_index: InternPool.Cau.Index) !SemaCauResult {
};
}
- const nav_already_populated, const queue_linker_work, const resolve_type = switch (ip.indexToKey(decl_val.toIntern())) {
- .func => |f| .{ f.owner_nav == nav_index, true, false },
- .variable => |v| .{ false, v.owner_nav == nav_index, true },
- .@"extern" => .{ false, false, false },
- else => .{ false, true, true },
+ const nav_already_populated, const queue_linker_work = switch (ip.indexToKey(decl_val.toIntern())) {
+ .func => |f| .{ f.owner_nav == nav_index, true },
+ .variable => |v| .{ false, v.owner_nav == nav_index },
+ .@"extern" => .{ false, false },
+ else => .{ false, true },
};
if (nav_already_populated) {
@@ -1317,16 +1317,7 @@ fn semaCau(pt: Zcu.PerThread, cau_index: InternPool.Cau.Index) !SemaCauResult {
queue_codegen: {
if (!queue_linker_work) break :queue_codegen;
- if (resolve_type) {
- // Needed for codegen_nav which will call updateDecl and then the
- // codegen backend wants full access to the Decl Type.
- // We also need this for the `isFnOrHasRuntimeBits` check below.
- // TODO: we could make the language more lenient by deferring this work
- // to the `codegen_nav` job.
- try decl_ty.resolveFully(pt);
- }
-
- if (!resolve_type or !decl_ty.hasRuntimeBits(zcu)) {
+ if (!try decl_ty.hasRuntimeBitsSema(pt)) {
if (zcu.comp.config.use_llvm) break :queue_codegen;
if (file.mod.strip) break :queue_codegen;
}
diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig
index 9ec0fa3012..6efa708d05 100644
--- a/src/link/Dwarf.zig
+++ b/src/link/Dwarf.zig
@@ -2643,10 +2643,8 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
try uleb128(diw, nav_val.toType().abiAlignment(zcu).toByteUnits().?);
for (0..loaded_struct.field_types.len) |field_index| {
const is_comptime = loaded_struct.fieldIsComptime(ip, field_index);
- const field_init = if (loaded_struct.haveFieldInits(ip))
- loaded_struct.fieldInit(ip, field_index)
- else
- .none;
+ const field_init = loaded_struct.fieldInit(ip, field_index);
+ assert(!(is_comptime and field_init == .none));
try wip_nav.abbrevCode(if (is_comptime)
.struct_field_comptime
else if (field_init != .none)
@@ -2658,20 +2656,14 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
defer dwarf.gpa.free(field_name);
try wip_nav.strp(field_name);
}
- if (is_comptime and field_init == .none) {
- // workaround frontend bug
- try wip_nav.refType(Type.void);
- try wip_nav.blockValue(nav_src_loc, Value.void);
- } else {
- const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
- try wip_nav.refType(field_type);
- if (!is_comptime) {
- try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
- try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
- field_type.abiAlignment(zcu).toByteUnits().?);
- }
- if (field_init != .none) try wip_nav.blockValue(nav_src_loc, Value.fromInterned(field_init));
+ const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
+ try wip_nav.refType(field_type);
+ if (!is_comptime) {
+ try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
+ try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
+ field_type.abiAlignment(zcu).toByteUnits().?);
}
+ if (field_init != .none) try wip_nav.blockValue(nav_src_loc, Value.fromInterned(field_init));
}
try uleb128(diw, @intFromEnum(AbbrevCode.null));
}
@@ -3511,10 +3503,8 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
try uleb128(diw, ty.abiAlignment(zcu).toByteUnits().?);
for (0..loaded_struct.field_types.len) |field_index| {
const is_comptime = loaded_struct.fieldIsComptime(ip, field_index);
- const field_init = if (loaded_struct.haveFieldInits(ip))
- loaded_struct.fieldInit(ip, field_index)
- else
- .none;
+ const field_init = loaded_struct.fieldInit(ip, field_index);
+ assert(!(is_comptime and field_init == .none));
try wip_nav.abbrevCode(if (is_comptime)
.struct_field_comptime
else if (field_init != .none)
@@ -3526,20 +3516,14 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
defer dwarf.gpa.free(field_name);
try wip_nav.strp(field_name);
}
- if (is_comptime and field_init == .none) {
- // workaround frontend bug
- try wip_nav.refType(Type.void);
- try wip_nav.blockValue(ty_src_loc, Value.void);
- } else {
- const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
- try wip_nav.refType(field_type);
- if (!is_comptime) {
- try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
- try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
- field_type.abiAlignment(zcu).toByteUnits().?);
- }
- if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
+ const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
+ try wip_nav.refType(field_type);
+ if (!is_comptime) {
+ try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
+ try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
+ field_type.abiAlignment(zcu).toByteUnits().?);
}
+ if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
}
try uleb128(diw, @intFromEnum(AbbrevCode.null));
}
@@ -3595,10 +3579,8 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
try uleb128(diw, ty.abiAlignment(zcu).toByteUnits().?);
for (0..loaded_struct.field_types.len) |field_index| {
const is_comptime = loaded_struct.fieldIsComptime(ip, field_index);
- const field_init = if (loaded_struct.haveFieldInits(ip))
- loaded_struct.fieldInit(ip, field_index)
- else
- .none;
+ const field_init = loaded_struct.fieldInit(ip, field_index);
+ assert(!(is_comptime and field_init == .none));
try wip_nav.abbrevCode(if (is_comptime)
.struct_field_comptime
else if (field_init != .none)
@@ -3610,20 +3592,14 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
defer dwarf.gpa.free(field_name);
try wip_nav.strp(field_name);
}
- if (is_comptime and field_init == .none) {
- // workaround frontend bug
- try wip_nav.refType(Type.void);
- try wip_nav.blockValue(ty_src_loc, Value.void);
- } else {
- const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
- try wip_nav.refType(field_type);
- if (!is_comptime) {
- try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
- try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
- field_type.abiAlignment(zcu).toByteUnits().?);
- }
- if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
+ const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]);
+ try wip_nav.refType(field_type);
+ if (!is_comptime) {
+ try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]);
+ try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse
+ field_type.abiAlignment(zcu).toByteUnits().?);
}
+ if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init));
}
try uleb128(diw, @intFromEnum(AbbrevCode.null));
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-27 22:47:06 +0000