| author |  Meghan Denny <hello@nektro.net> 2022-03-30 20:47:45-07:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2022-03-31 02:12:44-04:00 |
| log | 08565b23f94655e3b2610187f71ba774ce89eeb8 |
| tree | d313dff0b3121b3f840e2de45d17b3d7f457fcde |
| parent | 75c2cff40ef5c758ec18455324a50378684aff85 |
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( | ... | @@ -7205,14 +7205,11 @@ fn builtinCall( |
| 7205 | .src => { | 7205 | .src => { |
| 7206 | const token_starts = tree.tokens.items(.start); | 7206 | const token_starts = tree.tokens.items(.start); |
| 7207 | const node_start = token_starts[tree.firstToken(node)]; | 7207 | const node_start = token_starts[tree.firstToken(node)]; |
| 7208 | |||
| 7209 | astgen.advanceSourceCursor(node_start); | 7208 | astgen.advanceSourceCursor(node_start); |
| 7210 | |||
| 7211 | const result = try gz.addExtendedPayload(.builtin_src, Zir.Inst.LineColumn{ | 7209 | const result = try gz.addExtendedPayload(.builtin_src, Zir.Inst.LineColumn{ |
| 7212 | .line = @intCast(u32, astgen.source_line), | 7210 | .line = astgen.source_line, |
| 7213 | .column = @intCast(u32, astgen.source_column), | 7211 | .column = astgen.source_column, |
| 7214 | }); | 7212 | }); |
| 7215 | |||
| 7216 | return rvalue(gz, rl, result, node); | 7213 | return rvalue(gz, rl, result, node); |
| 7217 | }, | 7214 | }, |
| 7218 | 7215 |
src/Zir.zig+1-1
| ... | @@ -1587,7 +1587,7 @@ pub const Inst = struct { | ... | @@ -1587,7 +1587,7 @@ pub const Inst = struct { |
| 1587 | /// `operand` is `src_node: i32`. | 1587 | /// `operand` is `src_node: i32`. |
| 1588 | ret_addr, | 1588 | ret_addr, |
| 1589 | /// Implements the `@src` builtin. | 1589 | /// Implements the `@src` builtin. |
| 1590 | /// `operand` is payload index to `ColumnLine`. | 1590 | /// `operand` is payload index to `LineColumn`. |
| 1591 | builtin_src, | 1591 | builtin_src, |
| 1592 | /// Implements the `@errorReturnTrace` builtin. | 1592 | /// Implements the `@errorReturnTrace` builtin. |
| 1593 | /// `operand` is `src_node: i32`. | 1593 | /// `operand` is `src_node: i32`. |
src/print_zir.zig+6-1
| ... | @@ -461,9 +461,14 @@ const Writer = struct { | ... | @@ -461,9 +461,14 @@ const Writer = struct { |
| 461 | .error_return_trace, | 461 | .error_return_trace, |
| 462 | .frame, | 462 | .frame, |
| 463 | .frame_address, | 463 | .frame_address, |
| 464 | .builtin_src, | ||
| 465 | => try self.writeExtNode(stream, extended), | 464 | => try self.writeExtNode(stream, extended), |
| 466 | 465 | ||
| 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 | |||
| 467 | .dbg_block_begin, | 472 | .dbg_block_begin, |
| 468 | .dbg_block_end, | 473 | .dbg_block_end, |
| 469 | => try stream.writeAll("))"), | 474 | => try stream.writeAll("))"), |