Commit bab6bf4194511c609210624d53b6601268719ac9 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2024-09-15 13:54:36+01:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2024-09-15 16:03:56+01:00
log	bab6bf4194511c609210624d53b6601268719ac9
tree	929196f8a12d7ca4618a5aabf1389c26c537b1ac
parent	4d81e8ee915c3e012131cf90ed87cc8c6a01a934
signature	Commit is signed but in an unrecognized format.

compiler: always resolve field inits, remove unnecessary eager resolution

Resolves: #21362

2 files changed, 7 insertions(+), 15 deletions(-)

src
- Sema.zig
- Zcu
  - PerThread.zig

src/Sema.zig+1

...	@@ -36337,6 +36337,7 @@ pub fn resolveUnionLayout(sema: *Sema, ty: Type) SemaError!void {	...	@@ -36337,6 +36337,7 @@ pub fn resolveUnionLayout(sema: *Sema, ty: Type) SemaError!void {
36337	/// be resolved.	36337	/// be resolved.
36338	pub fn resolveStructFully(sema: *Sema, ty: Type) SemaError!void {	36338	pub fn resolveStructFully(sema: *Sema, ty: Type) SemaError!void {
36339	try sema.resolveStructLayout(ty);	36339	try sema.resolveStructLayout(ty);
		36340	try sema.resolveStructFieldInits(ty);
36340		36341
36341	const pt = sema.pt;	36342	const pt = sema.pt;
36342	const zcu = pt.zcu;	36343	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 {
         };
     }
-    const nav_already_populated, const queue_linker_work, const resolve_type = switch (ip.indexToKey(decl_val.toIntern())) {
+    const nav_already_populated, const queue_linker_work = switch (ip.indexToKey(decl_val.toIntern())) {
-        .func => |f| .{ f.owner_nav == nav_index, true, false },
+        .func => |f| .{ f.owner_nav == nav_index, true },
-        .variable => |v| .{ false, v.owner_nav == nav_index, true },
+        .variable => |v| .{ false, v.owner_nav == nav_index },
-        .@"extern" => .{ false, false, false },
+        .@"extern" => .{ false, false },
-        else => .{ false, true, true },
+        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) {
+        if (!try decl_ty.hasRuntimeBitsSema(pt)) {
-            // 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 (zcu.comp.config.use_llvm) break :queue_codegen;
             if (file.mod.strip) break :queue_codegen;
         }