authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-08-21 01:26:10-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-08-21 01:43:22-04:00
logdb48a789632ed901cedfa9af480bb987c23fcdbf
tree89f0cb8bf7b72b0eaf96789345e4b184a1223925
parentb17bbf9e6cf9862dabac4402d9dab5cbeb3063a1

Dwarf: ensure stale relocations are deleted

1 files changed, 51 insertions(+), 17 deletions(-)

src/link/Dwarf.zig+51-17
......@@ -1958,11 +1958,10 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
19581958 const loc = tree.tokenLocation(0, tree.nodes.items(.main_token)[decl_inst.data.declaration.src_node]);
19591959 assert(loc.line == zcu.navSrcLine(nav_index));
19601960
1961 const unit = try dwarf.getUnit(file.mod);
19621961 var wip_nav: WipNav = .{
19631962 .dwarf = dwarf,
19641963 .pt = pt,
1965 .unit = unit,
1964 .unit = try dwarf.getUnit(file.mod),
19661965 .entry = undefined,
19671966 .any_children = false,
19681967 .func = .none,
......@@ -1981,7 +1980,7 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
19811980 switch (ip.indexToKey(nav_val.toIntern())) {
19821981 .func => |func| {
19831982 if (nav_gop.found_existing) {
1984 const unit_ptr = dwarf.debug_info.section.getUnit(unit);
1983 const unit_ptr = dwarf.debug_info.section.getUnit(wip_nav.unit);
19851984 const entry_ptr = unit_ptr.getEntry(nav_gop.value_ptr.*);
19861985 if (entry_ptr.len >= AbbrevCode.decl_bytes) {
19871986 var abbrev_code_buf: [AbbrevCode.decl_bytes]u8 = undefined;
......@@ -2000,7 +1999,7 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
20001999 }
20012000 }
20022001 entry_ptr.clear();
2003 } else nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2002 } else nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
20042003 wip_nav.entry = nav_gop.value_ptr.*;
20052004
20062005 const parent_type, const accessibility: u8 = if (nav.analysis_owner.unwrap()) |cau| parent: {
......@@ -2074,8 +2073,14 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
20742073 if (type_inst_info.inst != value_inst) break :decl_struct;
20752074
20762075 const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
2077 if (type_gop.found_existing) nav_gop.value_ptr.* = type_gop.value_ptr.* else {
2078 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2076 if (type_gop.found_existing) {
2077 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(type_gop.value_ptr.*).clear();
2078 nav_gop.value_ptr.* = type_gop.value_ptr.*;
2079 } else {
2080 if (nav_gop.found_existing)
2081 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2082 else
2083 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
20792084 type_gop.value_ptr.* = nav_gop.value_ptr.*;
20802085 }
20812086 wip_nav.entry = nav_gop.value_ptr.*;
......@@ -2139,7 +2144,10 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
21392144 break :done;
21402145 }
21412146
2142 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2147 if (nav_gop.found_existing)
2148 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2149 else
2150 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
21432151 wip_nav.entry = nav_gop.value_ptr.*;
21442152 const diw = wip_nav.debug_info.writer(dwarf.gpa);
21452153 try uleb128(diw, @intFromEnum(AbbrevCode.decl_alias));
......@@ -2190,8 +2198,14 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
21902198 if (type_inst_info.inst != value_inst) break :decl_enum;
21912199
21922200 const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
2193 if (type_gop.found_existing) nav_gop.value_ptr.* = type_gop.value_ptr.* else {
2194 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2201 if (type_gop.found_existing) {
2202 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(type_gop.value_ptr.*).clear();
2203 nav_gop.value_ptr.* = type_gop.value_ptr.*;
2204 } else {
2205 if (nav_gop.found_existing)
2206 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2207 else
2208 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
21952209 type_gop.value_ptr.* = nav_gop.value_ptr.*;
21962210 }
21972211 wip_nav.entry = nav_gop.value_ptr.*;
......@@ -2215,7 +2229,10 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
22152229 break :done;
22162230 }
22172231
2218 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2232 if (nav_gop.found_existing)
2233 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2234 else
2235 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
22192236 wip_nav.entry = nav_gop.value_ptr.*;
22202237 const diw = wip_nav.debug_info.writer(dwarf.gpa);
22212238 try uleb128(diw, @intFromEnum(AbbrevCode.decl_alias));
......@@ -2264,8 +2281,14 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
22642281 if (type_inst_info.inst != value_inst) break :decl_union;
22652282
22662283 const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
2267 if (type_gop.found_existing) nav_gop.value_ptr.* = type_gop.value_ptr.* else {
2268 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2284 if (type_gop.found_existing) {
2285 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(type_gop.value_ptr.*).clear();
2286 nav_gop.value_ptr.* = type_gop.value_ptr.*;
2287 } else {
2288 if (nav_gop.found_existing)
2289 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2290 else
2291 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
22692292 type_gop.value_ptr.* = nav_gop.value_ptr.*;
22702293 }
22712294 wip_nav.entry = nav_gop.value_ptr.*;
......@@ -2328,7 +2351,10 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
23282351 break :done;
23292352 }
23302353
2331 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2354 if (nav_gop.found_existing)
2355 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2356 else
2357 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
23322358 wip_nav.entry = nav_gop.value_ptr.*;
23332359 const diw = wip_nav.debug_info.writer(dwarf.gpa);
23342360 try uleb128(diw, @intFromEnum(AbbrevCode.decl_alias));
......@@ -2377,8 +2403,14 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
23772403 if (type_inst_info.inst != value_inst) break :decl_opaque;
23782404
23792405 const type_gop = try dwarf.types.getOrPut(dwarf.gpa, nav_val.toIntern());
2380 if (type_gop.found_existing) nav_gop.value_ptr.* = type_gop.value_ptr.* else {
2381 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2406 if (type_gop.found_existing) {
2407 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(type_gop.value_ptr.*).clear();
2408 nav_gop.value_ptr.* = type_gop.value_ptr.*;
2409 } else {
2410 if (nav_gop.found_existing)
2411 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2412 else
2413 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
23822414 type_gop.value_ptr.* = nav_gop.value_ptr.*;
23832415 }
23842416 wip_nav.entry = nav_gop.value_ptr.*;
......@@ -2394,7 +2426,10 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
23942426 break :done;
23952427 }
23962428
2397 if (!nav_gop.found_existing) nav_gop.value_ptr.* = try dwarf.addCommonEntry(unit);
2429 if (nav_gop.found_existing)
2430 dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(nav_gop.value_ptr.*).clear()
2431 else
2432 nav_gop.value_ptr.* = try dwarf.addCommonEntry(wip_nav.unit);
23982433 wip_nav.entry = nav_gop.value_ptr.*;
23992434 const diw = wip_nav.debug_info.writer(dwarf.gpa);
24002435 try uleb128(diw, @intFromEnum(AbbrevCode.decl_alias));
......@@ -2412,7 +2447,6 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
24122447 },
24132448 }
24142449 try dwarf.debug_info.section.replaceEntry(wip_nav.unit, wip_nav.entry, dwarf, wip_nav.debug_info.items);
2415 try dwarf.debug_loclists.section.replaceEntry(wip_nav.unit, wip_nav.entry, dwarf, wip_nav.debug_loclists.items);
24162450 try wip_nav.flush();
24172451}
24182452