authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-09-12 12:02:21-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-10-09 07:48:09-04:00
logc127c06fd73689987db6c336090d6432d9ee40a6
tree944e56368d388ce7d2f8073e35f5a28fa91be3d0
parentd354daf143525cda701e46473d7d2785ae4c05ab

Dwarf: implement and test lexical blocks

6 files changed, 226 insertions(+), 71 deletions(-)

src/arch/x86_64/CodeGen.zig+14-7
......@@ -2180,6 +2180,12 @@ fn checkInvariantsAfterAirInst(self: *Self, inst: Air.Inst.Index, old_air_bookke
21802180 }
21812181}
21822182
2183fn genBodyBlock(self: *Self, body: []const Air.Inst.Index) InnerError!void {
2184 try self.asmPseudo(.pseudo_dbg_enter_block_none);
2185 try self.genBody(body);
2186 try self.asmPseudo(.pseudo_dbg_leave_block_none);
2187}
2188
21832189fn genBody(self: *Self, body: []const Air.Inst.Index) InnerError!void {
21842190 const pt = self.pt;
21852191 const zcu = pt.zcu;
......@@ -13184,7 +13190,7 @@ fn genTry(
1318413190 const state = try self.saveState();
1318513191
1318613192 for (liveness_cond_br.else_deaths) |death| try self.processDeath(death);
13187 try self.genBody(body);
13193 try self.genBodyBlock(body);
1318813194 try self.restoreState(state, &.{}, .{
1318913195 .emit_instructions = false,
1319013196 .update_tracking = true,
......@@ -13293,7 +13299,7 @@ fn airCondBr(self: *Self, inst: Air.Inst.Index) !void {
1329313299 const reloc = try self.genCondBrMir(cond_ty, cond);
1329413300
1329513301 for (liveness_cond_br.then_deaths) |death| try self.processDeath(death);
13296 try self.genBody(then_body);
13302 try self.genBodyBlock(then_body);
1329713303 try self.restoreState(state, &.{}, .{
1329813304 .emit_instructions = false,
1329913305 .update_tracking = true,
......@@ -13304,7 +13310,7 @@ fn airCondBr(self: *Self, inst: Air.Inst.Index) !void {
1330413310 self.performReloc(reloc);
1330513311
1330613312 for (liveness_cond_br.else_deaths) |death| try self.processDeath(death);
13307 try self.genBody(else_body);
13313 try self.genBodyBlock(else_body);
1330813314 try self.restoreState(state, &.{}, .{
1330913315 .emit_instructions = false,
1331013316 .update_tracking = true,
......@@ -13665,14 +13671,16 @@ fn airLoop(self: *Self, inst: Air.Inst.Index) !void {
1366513671 });
1366613672 defer assert(self.loops.remove(inst));
1366713673
13668 try self.genBody(body);
13674 try self.genBodyBlock(body);
1366913675 self.finishAirBookkeeping();
1367013676}
1367113677
1367213678fn airBlock(self: *Self, inst: Air.Inst.Index) !void {
1367313679 const ty_pl = self.air.instructions.items(.data)[@intFromEnum(inst)].ty_pl;
1367413680 const extra = self.air.extraData(Air.Block, ty_pl.payload);
13681 try self.asmPseudo(.pseudo_dbg_enter_block_none);
1367513682 try self.lowerBlock(inst, @ptrCast(self.air.extra[extra.end..][0..extra.data.body_len]));
13683 try self.asmPseudo(.pseudo_dbg_leave_block_none);
1367613684}
1367713685
1367813686fn lowerBlock(self: *Self, inst: Air.Inst.Index, body: []const Air.Inst.Index) !void {
......@@ -13684,7 +13692,6 @@ fn lowerBlock(self: *Self, inst: Air.Inst.Index, body: []const Air.Inst.Index) !
1368413692 try self.blocks.putNoClobber(self.gpa, inst, .{ .state = self.initRetroactiveState() });
1368513693 const liveness = self.liveness.getBlock(inst);
1368613694
13687 // TODO emit debug info lexical block
1368813695 try self.genBody(body);
1368913696
1369013697 var block_data = self.blocks.fetchRemove(inst).?;
......@@ -13796,7 +13803,7 @@ fn lowerSwitchBr(self: *Self, inst: Air.Inst.Index, switch_br: Air.UnwrappedSwit
1379613803
1379713804 // Relocate all success cases to the body we're about to generate.
1379813805 for (relocs) |reloc| self.performReloc(reloc);
13799 try self.genBody(case.body);
13806 try self.genBodyBlock(case.body);
1380013807 try self.restoreState(state, &.{}, .{
1380113808 .emit_instructions = false,
1380213809 .update_tracking = true,
......@@ -13814,7 +13821,7 @@ fn lowerSwitchBr(self: *Self, inst: Air.Inst.Index, switch_br: Air.UnwrappedSwit
1381413821 const else_deaths = liveness.deaths.len - 1;
1381513822 for (liveness.deaths[else_deaths]) |operand| try self.processDeath(operand);
1381613823
13817 try self.genBody(else_body);
13824 try self.genBodyBlock(else_body);
1381813825 try self.restoreState(state, &.{}, .{
1381913826 .emit_instructions = false,
1382013827 .update_tracking = true,
src/arch/x86_64/Emit.zig+24
......@@ -287,6 +287,30 @@ pub fn emitMir(emit: *Emit) Error!void {
287287 .none => {},
288288 }
289289 },
290 .pseudo_dbg_enter_block_none => {
291 switch (emit.debug_output) {
292 .dwarf => |dw| {
293 log.debug("mirDbgEnterBlock (line={d}, col={d})", .{
294 emit.prev_di_line, emit.prev_di_column,
295 });
296 try dw.enterBlock(emit.code.items.len);
297 },
298 .plan9 => {},
299 .none => {},
300 }
301 },
302 .pseudo_dbg_leave_block_none => {
303 switch (emit.debug_output) {
304 .dwarf => |dw| {
305 log.debug("mirDbgLeaveBlock (line={d}, col={d})", .{
306 emit.prev_di_line, emit.prev_di_column,
307 });
308 try dw.leaveBlock(emit.code.items.len);
309 },
310 .plan9 => {},
311 .none => {},
312 }
313 },
290314 .pseudo_dbg_enter_inline_func => {
291315 switch (emit.debug_output) {
292316 .dwarf => |dw| {
src/arch/x86_64/Lower.zig+2
......@@ -312,6 +312,8 @@ pub fn lowerMir(lower: *Lower, index: Mir.Inst.Index) Error!struct {
312312 .pseudo_dbg_prologue_end_none,
313313 .pseudo_dbg_line_line_column,
314314 .pseudo_dbg_epilogue_begin_none,
315 .pseudo_dbg_enter_block_none,
316 .pseudo_dbg_leave_block_none,
315317 .pseudo_dbg_enter_inline_func,
316318 .pseudo_dbg_leave_inline_func,
317319 .pseudo_dbg_local_a,
src/arch/x86_64/Mir.zig+4
......@@ -935,6 +935,10 @@ pub const Inst = struct {
935935 pseudo_dbg_line_line_column,
936936 /// Start of epilogue
937937 pseudo_dbg_epilogue_begin_none,
938 /// Start of lexical block
939 pseudo_dbg_enter_block_none,
940 /// End of lexical block
941 pseudo_dbg_leave_block_none,
938942 /// Start of inline function
939943 pseudo_dbg_enter_inline_func,
940944 /// End of inline function
src/link/Dwarf.zig+95-64
......@@ -1374,10 +1374,11 @@ pub const WipNav = struct {
13741374 any_children: bool,
13751375 func: InternPool.Index,
13761376 func_sym_index: u32,
1377 func_high_reloc: u32,
1378 inlined_funcs: std.ArrayListUnmanaged(struct {
1377 func_high_pc: u32,
1378 blocks: std.ArrayListUnmanaged(struct {
13791379 abbrev_code: u32,
1380 high_reloc: u32,
1380 low_pc_off: u64,
1381 high_pc: u32,
13811382 }),
13821383 cfi: struct {
13831384 loc: u32,
......@@ -1391,7 +1392,7 @@ pub const WipNav = struct {
13911392
13921393 pub fn deinit(wip_nav: *WipNav) void {
13931394 const gpa = wip_nav.dwarf.gpa;
1394 if (wip_nav.func != .none) wip_nav.inlined_funcs.deinit(gpa);
1395 if (wip_nav.func != .none) wip_nav.blocks.deinit(gpa);
13951396 wip_nav.debug_frame.deinit(gpa);
13961397 wip_nav.debug_info.deinit(gpa);
13971398 wip_nav.debug_line.deinit(gpa);
......@@ -1486,49 +1487,72 @@ pub const WipNav = struct {
14861487 try dlw.writeByte(DW.LNS.set_epilogue_begin);
14871488 }
14881489
1489 pub fn enterInlineFunc(wip_nav: *WipNav, func: InternPool.Index, code_off: u64, line: u32, column: u32) UpdateError!void {
1490 pub fn enterBlock(wip_nav: *WipNav, code_off: u64) UpdateError!void {
1491 const dwarf = wip_nav.dwarf;
1492 const diw = wip_nav.debug_info.writer(dwarf.gpa);
1493 const block = try wip_nav.blocks.addOne(dwarf.gpa);
1494
1495 block.abbrev_code = @intCast(wip_nav.debug_info.items.len);
1496 try wip_nav.abbrevCode(.block);
1497 block.low_pc_off = code_off;
1498 try wip_nav.infoAddrSym(wip_nav.func_sym_index, code_off);
1499 block.high_pc = @intCast(wip_nav.debug_info.items.len);
1500 try diw.writeInt(u32, 0, dwarf.endian);
1501 wip_nav.any_children = false;
1502 }
1503
1504 pub fn leaveBlock(wip_nav: *WipNav, code_off: u64) UpdateError!void {
1505 const block_bytes = comptime uleb128Bytes(@intFromEnum(AbbrevCode.block));
1506 const block = wip_nav.blocks.pop();
1507 if (wip_nav.any_children)
1508 try uleb128(wip_nav.debug_info.writer(wip_nav.dwarf.gpa), @intFromEnum(AbbrevCode.null))
1509 else
1510 std.leb.writeUnsignedFixed(
1511 block_bytes,
1512 wip_nav.debug_info.items[block.abbrev_code..][0..block_bytes],
1513 try wip_nav.dwarf.refAbbrevCode(.empty_block),
1514 );
1515 std.mem.writeInt(u32, wip_nav.debug_info.items[block.high_pc..][0..4], @intCast(code_off - block.low_pc_off), wip_nav.dwarf.endian);
1516 wip_nav.any_children = true;
1517 }
1518
1519 pub fn enterInlineFunc(
1520 wip_nav: *WipNav,
1521 func: InternPool.Index,
1522 code_off: u64,
1523 line: u32,
1524 column: u32,
1525 ) UpdateError!void {
14901526 const dwarf = wip_nav.dwarf;
14911527 const zcu = wip_nav.pt.zcu;
14921528 const diw = wip_nav.debug_info.writer(dwarf.gpa);
1493 const inlined_func = try wip_nav.inlined_funcs.addOne(dwarf.gpa);
1529 const block = try wip_nav.blocks.addOne(dwarf.gpa);
14941530
1495 inlined_func.abbrev_code = @intCast(wip_nav.debug_info.items.len);
1531 block.abbrev_code = @intCast(wip_nav.debug_info.items.len);
14961532 try wip_nav.abbrevCode(.inlined_func);
14971533 try wip_nav.refNav(zcu.funcInfo(func).owner_nav);
14981534 try uleb128(diw, zcu.navSrcLine(zcu.funcInfo(wip_nav.func).owner_nav) + line + 1);
14991535 try uleb128(diw, column + 1);
1500 const external_relocs = &dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(wip_nav.entry).external_relocs;
1501 try external_relocs.ensureUnusedCapacity(dwarf.gpa, 2);
1502 external_relocs.appendAssumeCapacity(.{
1503 .source_off = @intCast(wip_nav.debug_info.items.len),
1504 .target_sym = wip_nav.func_sym_index,
1505 .target_off = code_off,
1506 });
1507 try diw.writeByteNTimes(0, @intFromEnum(dwarf.address_size));
1508 inlined_func.high_reloc = @intCast(external_relocs.items.len);
1509 external_relocs.appendAssumeCapacity(.{
1510 .source_off = @intCast(wip_nav.debug_info.items.len),
1511 .target_sym = wip_nav.func_sym_index,
1512 .target_off = undefined,
1513 });
1514 try diw.writeByteNTimes(0, @intFromEnum(dwarf.address_size));
1536 block.low_pc_off = code_off;
1537 try wip_nav.infoAddrSym(wip_nav.func_sym_index, code_off);
1538 block.high_pc = @intCast(wip_nav.debug_info.items.len);
1539 try diw.writeInt(u32, 0, dwarf.endian);
15151540 try wip_nav.setInlineFunc(func);
15161541 wip_nav.any_children = false;
15171542 }
15181543
15191544 pub fn leaveInlineFunc(wip_nav: *WipNav, func: InternPool.Index, code_off: u64) UpdateError!void {
15201545 const inlined_func_bytes = comptime uleb128Bytes(@intFromEnum(AbbrevCode.inlined_func));
1521 const inlined_func = wip_nav.inlined_funcs.pop();
1522 const external_relocs = &wip_nav.dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(wip_nav.entry).external_relocs;
1523 external_relocs.items[inlined_func.high_reloc].target_off = code_off;
1546 const block = wip_nav.blocks.pop();
15241547 if (wip_nav.any_children)
15251548 try uleb128(wip_nav.debug_info.writer(wip_nav.dwarf.gpa), @intFromEnum(AbbrevCode.null))
15261549 else
15271550 std.leb.writeUnsignedFixed(
15281551 inlined_func_bytes,
1529 wip_nav.debug_info.items[inlined_func.abbrev_code..][0..inlined_func_bytes],
1552 wip_nav.debug_info.items[block.abbrev_code..][0..inlined_func_bytes],
15301553 try wip_nav.dwarf.refAbbrevCode(.empty_inlined_func),
15311554 );
1555 std.mem.writeInt(u32, wip_nav.debug_info.items[block.high_pc..][0..4], @intCast(code_off - block.low_pc_off), wip_nav.dwarf.endian);
15321556 try wip_nav.setInlineFunc(func);
15331557 wip_nav.any_children = true;
15341558 }
......@@ -1664,17 +1688,18 @@ pub const WipNav = struct {
16641688 return ctx.wip_nav.dwarf.endian;
16651689 }
16661690 fn addrSym(ctx: @This(), sym_index: u32) UpdateError!void {
1667 try ctx.wip_nav.infoAddrSym(sym_index);
1691 try ctx.wip_nav.infoAddrSym(sym_index, 0);
16681692 }
16691693 } = .{ .wip_nav = wip_nav };
16701694 try uleb128(adapter.writer(), counter.stream.bytes_written);
16711695 try loc.write(adapter);
16721696 }
16731697
1674 fn infoAddrSym(wip_nav: *WipNav, sym_index: u32) UpdateError!void {
1698 fn infoAddrSym(wip_nav: *WipNav, sym_index: u32, sym_off: u64) UpdateError!void {
16751699 try wip_nav.infoExternalReloc(.{
16761700 .source_off = @intCast(wip_nav.debug_info.items.len),
16771701 .target_sym = sym_index,
1702 .target_off = sym_off,
16781703 });
16791704 try wip_nav.debug_info.appendNTimes(wip_nav.dwarf.gpa, 0, @intFromEnum(wip_nav.dwarf.address_size));
16801705 }
......@@ -1695,17 +1720,18 @@ pub const WipNav = struct {
16951720 return ctx.wip_nav.dwarf.endian;
16961721 }
16971722 fn addrSym(ctx: @This(), sym_index: u32) UpdateError!void {
1698 try ctx.wip_nav.frameAddrSym(sym_index);
1723 try ctx.wip_nav.frameAddrSym(sym_index, 0);
16991724 }
17001725 } = .{ .wip_nav = wip_nav };
17011726 try uleb128(adapter.writer(), counter.stream.bytes_written);
17021727 try loc.write(adapter);
17031728 }
17041729
1705 fn frameAddrSym(wip_nav: *WipNav, sym_index: u32) UpdateError!void {
1730 fn frameAddrSym(wip_nav: *WipNav, sym_index: u32, sym_off: u64) UpdateError!void {
17061731 try wip_nav.frameExternalReloc(.{
17071732 .source_off = @intCast(wip_nav.debug_frame.items.len),
17081733 .target_sym = sym_index,
1734 .target_off = sym_off,
17091735 });
17101736 try wip_nav.debug_frame.appendNTimes(wip_nav.dwarf.gpa, 0, @intFromEnum(wip_nav.dwarf.address_size));
17111737 }
......@@ -2150,8 +2176,8 @@ pub fn initWipNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool.Nav.In
21502176 .any_children = false,
21512177 .func = .none,
21522178 .func_sym_index = undefined,
2153 .func_high_reloc = undefined,
2154 .inlined_funcs = undefined,
2179 .func_high_pc = undefined,
2180 .blocks = undefined,
21552181 .cfi = undefined,
21562182 .debug_frame = .{},
21572183 .debug_info = .{},
......@@ -2294,7 +2320,7 @@ pub fn initWipNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool.Nav.In
22942320 const func_type = ip.indexToKey(func.ty).func_type;
22952321 wip_nav.func = nav_val.toIntern();
22962322 wip_nav.func_sym_index = sym_index;
2297 wip_nav.inlined_funcs = .{};
2323 wip_nav.blocks = .{};
22982324 if (dwarf.debug_frame.header.format != .none) wip_nav.cfi = .{
22992325 .loc = 0,
23002326 .cfa = dwarf.debug_frame.header.initial_instructions[0].def_cfa,
......@@ -2319,7 +2345,7 @@ pub fn initWipNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool.Nav.In
23192345 .source_off = @intCast(wip_nav.debug_frame.items.len),
23202346 });
23212347 try dfw.writeByteNTimes(0, dwarf.sectionOffsetBytes());
2322 try wip_nav.frameAddrSym(sym_index);
2348 try wip_nav.frameAddrSym(sym_index, 0);
23232349 try dfw.writeByteNTimes(undefined, @intFromEnum(dwarf.address_size));
23242350 },
23252351 .eh_frame => {
......@@ -2346,20 +2372,9 @@ pub fn initWipNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool.Nav.In
23462372 try wip_nav.strp(nav.name.toSlice(ip));
23472373 try wip_nav.strp(nav.fqn.toSlice(ip));
23482374 try wip_nav.refType(Type.fromInterned(func_type.return_type));
2349 const external_relocs = &dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(wip_nav.entry).external_relocs;
2350 try external_relocs.ensureUnusedCapacity(dwarf.gpa, 2);
2351 external_relocs.appendAssumeCapacity(.{
2352 .source_off = @intCast(wip_nav.debug_info.items.len),
2353 .target_sym = sym_index,
2354 });
2355 try diw.writeByteNTimes(0, @intFromEnum(dwarf.address_size));
2356 wip_nav.func_high_reloc = @intCast(external_relocs.items.len);
2357 external_relocs.appendAssumeCapacity(.{
2358 .source_off = @intCast(wip_nav.debug_info.items.len),
2359 .target_sym = sym_index,
2360 .target_off = undefined,
2361 });
2362 try diw.writeByteNTimes(0, @intFromEnum(dwarf.address_size));
2375 try wip_nav.infoAddrSym(sym_index, 0);
2376 wip_nav.func_high_pc = @intCast(wip_nav.debug_info.items.len);
2377 try diw.writeInt(u32, 0, dwarf.endian);
23632378 try uleb128(diw, nav.status.resolved.alignment.toByteUnits() orelse
23642379 target_info.defaultFunctionAlignment(file.mod.resolved_target.result).toByteUnits().?);
23652380 try diw.writeByte(@intFromBool(false));
......@@ -2466,8 +2481,7 @@ pub fn finishWipNav(
24662481 },
24672482 }
24682483 {
2469 const external_relocs = &dwarf.debug_info.section.getUnit(wip_nav.unit).getEntry(wip_nav.entry).external_relocs;
2470 external_relocs.items[wip_nav.func_high_reloc].target_off = sym.size;
2484 std.mem.writeInt(u32, wip_nav.debug_info.items[wip_nav.func_high_pc..][0..4], @intCast(sym.size), dwarf.endian);
24712485 if (wip_nav.any_children) {
24722486 const diw = wip_nav.debug_info.writer(dwarf.gpa);
24732487 try uleb128(diw, @intFromEnum(AbbrevCode.null));
......@@ -2562,8 +2576,8 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool
25622576 .any_children = false,
25632577 .func = .none,
25642578 .func_sym_index = undefined,
2565 .func_high_reloc = undefined,
2566 .inlined_funcs = undefined,
2579 .func_high_pc = undefined,
2580 .blocks = undefined,
25672581 .cfi = undefined,
25682582 .debug_frame = .{},
25692583 .debug_info = .{},
......@@ -3036,8 +3050,8 @@ fn updateType(
30363050 .any_children = false,
30373051 .func = .none,
30383052 .func_sym_index = undefined,
3039 .func_high_reloc = undefined,
3040 .inlined_funcs = undefined,
3053 .func_high_pc = undefined,
3054 .blocks = undefined,
30413055 .cfi = undefined,
30423056 .debug_frame = .{},
30433057 .debug_info = .{},
......@@ -3480,8 +3494,8 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
34803494 .any_children = false,
34813495 .func = .none,
34823496 .func_sym_index = undefined,
3483 .func_high_reloc = undefined,
3484 .inlined_funcs = undefined,
3497 .func_high_pc = undefined,
3498 .blocks = undefined,
34853499 .cfi = undefined,
34863500 .debug_frame = .{},
34873501 .debug_info = .{},
......@@ -3553,8 +3567,8 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP
35533567 .any_children = false,
35543568 .func = .none,
35553569 .func_sym_index = undefined,
3556 .func_high_reloc = undefined,
3557 .inlined_funcs = undefined,
3570 .func_high_pc = undefined,
3571 .blocks = undefined,
35583572 .cfi = undefined,
35593573 .debug_frame = .{},
35603574 .debug_info = .{},
......@@ -3756,8 +3770,8 @@ pub fn flushModule(dwarf: *Dwarf, pt: Zcu.PerThread) FlushError!void {
37563770 .any_children = false,
37573771 .func = .none,
37583772 .func_sym_index = undefined,
3759 .func_high_reloc = undefined,
3760 .inlined_funcs = undefined,
3773 .func_high_pc = undefined,
3774 .blocks = undefined,
37613775 .cfi = undefined,
37623776 .debug_frame = .{},
37633777 .debug_info = .{},
......@@ -4212,6 +4226,8 @@ const AbbrevCode = enum {
42124226 empty_packed_struct_type,
42134227 union_type,
42144228 empty_union_type,
4229 empty_block,
4230 block,
42154231 empty_inlined_func,
42164232 inlined_func,
42174233 local_arg,
......@@ -4319,7 +4335,7 @@ const AbbrevCode = enum {
43194335 .{ .linkage_name, .strp },
43204336 .{ .type, .ref_addr },
43214337 .{ .low_pc, .addr },
4322 .{ .high_pc, .addr },
4338 .{ .high_pc, .data4 },
43234339 .{ .alignment, .udata },
43244340 .{ .external, .flag },
43254341 .{ .noreturn, .flag },
......@@ -4331,7 +4347,7 @@ const AbbrevCode = enum {
43314347 .{ .linkage_name, .strp },
43324348 .{ .type, .ref_addr },
43334349 .{ .low_pc, .addr },
4334 .{ .high_pc, .addr },
4350 .{ .high_pc, .data4 },
43354351 .{ .alignment, .udata },
43364352 .{ .external, .flag },
43374353 .{ .noreturn, .flag },
......@@ -4672,6 +4688,21 @@ const AbbrevCode = enum {
46724688 .{ .alignment, .udata },
46734689 },
46744690 },
4691 .empty_block = .{
4692 .tag = .lexical_block,
4693 .attrs = &.{
4694 .{ .low_pc, .addr },
4695 .{ .high_pc, .data4 },
4696 },
4697 },
4698 .block = .{
4699 .tag = .lexical_block,
4700 .children = true,
4701 .attrs = &.{
4702 .{ .low_pc, .addr },
4703 .{ .high_pc, .data4 },
4704 },
4705 },
46754706 .empty_inlined_func = .{
46764707 .tag = .inlined_subroutine,
46774708 .attrs = &.{
......@@ -4679,7 +4710,7 @@ const AbbrevCode = enum {
46794710 .{ .call_line, .udata },
46804711 .{ .call_column, .udata },
46814712 .{ .low_pc, .addr },
4682 .{ .high_pc, .addr },
4713 .{ .high_pc, .data4 },
46834714 },
46844715 },
46854716 .inlined_func = .{
......@@ -4690,7 +4721,7 @@ const AbbrevCode = enum {
46904721 .{ .call_line, .udata },
46914722 .{ .call_column, .udata },
46924723 .{ .low_pc, .addr },
4693 .{ .high_pc, .addr },
4724 .{ .high_pc, .data4 },
46944725 },
46954726 },
46964727 .local_arg = .{
test/src/Debugger.zig+87
......@@ -721,6 +721,93 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
721721 \\1 breakpoints deleted; 0 breakpoint locations disabled.
722722 },
723723 );
724 db.addLldbTest(
725 "if_blocks",
726 target,
727 &.{
728 .{
729 .path = "if_blocks.zig",
730 .source =
731 \\pub fn main() void {
732 \\ for (0..2) |i| {
733 \\ if (i == 0) {
734 \\ var x: u32 = 123;
735 \\ _ = &x;
736 \\ } else {
737 \\ var x: f32 = 4.5;
738 \\ _ = &x;
739 \\ }
740 \\ }
741 \\}
742 \\
743 ,
744 },
745 },
746 \\breakpoint set --file if_blocks.zig --source-pattern-regexp '_ = &x;'
747 \\process launch
748 \\frame variable
749 \\process continue
750 \\frame variable
751 \\breakpoint delete --force 1
752 ,
753 &.{
754 \\(lldb) frame variable
755 \\(usize) i = 0
756 \\(u32) x = 123
757 \\(lldb) process continue
758 ,
759 \\(lldb) frame variable
760 \\(usize) i = 1
761 \\(f32) x = 4.5
762 \\(lldb) breakpoint delete --force 1
763 \\1 breakpoints deleted; 0 breakpoint locations disabled.
764 },
765 );
766 db.addLldbTest(
767 "switch_blocks",
768 target,
769 &.{
770 .{
771 .path = "switch_blocks.zig",
772 .source =
773 \\pub fn main() void {
774 \\ for (0..2) |i| {
775 \\ switch (i) {
776 \\ 0 => {
777 \\ var x: u32 = 123;
778 \\ _ = &x;
779 \\ },
780 \\ else => {
781 \\ var x: f32 = 4.5;
782 \\ _ = &x;
783 \\ },
784 \\ }
785 \\ }
786 \\}
787 \\
788 ,
789 },
790 },
791 \\breakpoint set --file switch_blocks.zig --source-pattern-regexp '_ = &x;'
792 \\process launch
793 \\frame variable
794 \\process continue
795 \\frame variable
796 \\breakpoint delete --force 1
797 ,
798 &.{
799 \\(lldb) frame variable
800 \\(usize) i = 0
801 \\(u32) x = 123
802 \\(lldb) process continue
803 ,
804 \\(lldb) frame variable
805 \\(usize) i = 1
806 \\(f32) x = 4.5
807 \\(lldb) breakpoint delete --force 1
808 \\1 breakpoints deleted; 0 breakpoint locations disabled.
809 },
810 );
724811 db.addLldbTest(
725812 "inline_call",
726813 target,