authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-03-30 20:47:45-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-31 02:12:44-04:00
log08565b23f94655e3b2610187f71ba774ce89eeb8
treed313dff0b3121b3f840e2de45d17b3d7f457fcde
parent75c2cff40ef5c758ec18455324a50378684aff85

stage2: fix print_zir for .builtin_src

3 files changed, 9 insertions(+), 7 deletions(-)

src/AstGen.zig+2-5
......@@ -7205,14 +7205,11 @@ fn builtinCall(
72057205 .src => {
72067206 const token_starts = tree.tokens.items(.start);
72077207 const node_start = token_starts[tree.firstToken(node)];
7208
72097208 astgen.advanceSourceCursor(node_start);
7210
72117209 const result = try gz.addExtendedPayload(.builtin_src, Zir.Inst.LineColumn{
7212 .line = @intCast(u32, astgen.source_line),
7213 .column = @intCast(u32, astgen.source_column),
7210 .line = astgen.source_line,
7211 .column = astgen.source_column,
72147212 });
7215
72167213 return rvalue(gz, rl, result, node);
72177214 },
72187215
src/Zir.zig+1-1
......@@ -1587,7 +1587,7 @@ pub const Inst = struct {
15871587 /// `operand` is `src_node: i32`.
15881588 ret_addr,
15891589 /// Implements the `@src` builtin.
1590 /// `operand` is payload index to `ColumnLine`.
1590 /// `operand` is payload index to `LineColumn`.
15911591 builtin_src,
15921592 /// Implements the `@errorReturnTrace` builtin.
15931593 /// `operand` is `src_node: i32`.
src/print_zir.zig+6-1
......@@ -461,9 +461,14 @@ const Writer = struct {
461461 .error_return_trace,
462462 .frame,
463463 .frame_address,
464 .builtin_src,
465464 => try self.writeExtNode(stream, extended),
466465
466 .builtin_src => {
467 try stream.writeAll("))");
468 const inst_data = self.code.extraData(Zir.Inst.LineColumn, extended.operand).data;
469 try stream.print(":{d}:{d}", .{ inst_data.line + 1, inst_data.column + 1 });
470 },
471
467472 .dbg_block_begin,
468473 .dbg_block_end,
469474 => try stream.writeAll("))"),