Commit aaa7e739831f39151a37c7beb08660f0fb6ae0ed | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2024-08-28 06:27:38+01:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2024-08-28 08:39:59+01:00
log	aaa7e739831f39151a37c7beb08660f0fb6ae0ed
tree	1042467c31831ccf44d7a103a29407cce3ebf779
parent	0fe3fd01ddc2cd49c6a2b939577d16b9d2c65ea9
signature	Commit is signed but in an unrecognized format.

link.Dwarf: skip tests in updateComptimeNav

These won't live in the parent namespace as decls which causes problems
later in this function, and tests are guaranteed not to be referenced at
comptime anyway, so there's actually no need to run this logic.

1 files changed, 12 insertions(+), 4 deletions(-)

src
- link
  - Dwarf.zig

src/link/Dwarf.zig+12-4

 @@ -2477,6 +2477,18 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
     assert(file.zir_loaded);
     const decl_inst = file.zir.instructions.get(@intFromEnum(inst_info.inst));
     assert(decl_inst.tag == .declaration);
+    const decl_extra = file.zir.extraData(Zir.Inst.Declaration, decl_inst.data.declaration.payload_index);
+    const is_test = switch (decl_extra.data.name) {
+        .unnamed_test, .decltest => true,
+        .@"comptime", .@"usingnamespace" => false,
+        _ => decl_extra.data.name.isNamedTest(file.zir),
+    };
+    if (is_test) {
+        // This isn't actually a comptime Nav! It's a test, so it'll definitely never be referenced at comptime.
+        return;
+    }
     const tree = try file.getTree(dwarf.gpa);
     const loc = tree.tokenLocation(0, tree.nodes.items(.main_token)[decl_inst.data.declaration.src_node]);
     assert(loc.line == zcu.navSrcLine(nav_index));
 @@ -2582,7 +2594,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
                 if (loaded_struct.zir_index == .none) break :decl_struct;
                 const value_inst = value_inst: {
-                    const decl_extra = file.zir.extraData(Zir.Inst.Declaration, decl_inst.data.declaration.payload_index);
                     const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
                     const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
                     if (break_inst.tag != .break_inline) break :value_inst null;
 @@ -2704,7 +2715,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
                 if (loaded_enum.zir_index == .none) break :decl_enum;
                 const value_inst = value_inst: {
-                    const decl_extra = file.zir.extraData(Zir.Inst.Declaration, decl_inst.data.declaration.payload_index);
                     const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
                     const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
                     if (break_inst.tag != .break_inline) break :value_inst null;
 @@ -2788,7 +2798,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
             decl_union: {
                 const value_inst = value_inst: {
-                    const decl_extra = file.zir.extraData(Zir.Inst.Declaration, decl_inst.data.declaration.payload_index);
                     const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
                     const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
                     if (break_inst.tag != .break_inline) break :value_inst null;
 @@ -2911,7 +2920,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
             decl_opaque: {
                 const value_inst = value_inst: {
-                    const decl_extra = file.zir.extraData(Zir.Inst.Declaration, decl_inst.data.declaration.payload_index);
                     const decl_value_body = decl_extra.data.getBodies(@intCast(decl_extra.end), file.zir).value_body;
                     const break_inst = file.zir.instructions.get(@intFromEnum(decl_value_body[decl_value_body.len - 1]));
                     if (break_inst.tag != .break_inline) break :value_inst null;