authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-03-19 11:40:45+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-03-19 11:40:45+02:00
logd56e3c988f0707e996be8eeb7a55f8a90c497a26
treebd68ba25537739117e5fe83080b80b431d45d2e3
parent1e1f74034773e441e689036ef90fd5a451a9f9d1

stage2: fix inline fn parameter debug info being added to wrong block

2 files changed, 4 insertions(+), 4 deletions(-)

src/Sema.zig+2-2
...@@ -4853,14 +4853,14 @@ fn analyzeCall(...@@ -4853,14 +4853,14 @@ fn analyzeCall(
4853 const param_name = sema.code.nullTerminatedString(extra.data.name);4853 const param_name = sema.code.nullTerminatedString(extra.data.name);
4854 const inst = sema.inst_map.get(param).?;4854 const inst = sema.inst_map.get(param).?;
48554855
4856 try sema.addDbgVar(block, inst, .dbg_var_val, param_name);4856 try sema.addDbgVar(&child_block, inst, .dbg_var_val, param_name);
4857 },4857 },
4858 .param_anytype, .param_anytype_comptime => {4858 .param_anytype, .param_anytype_comptime => {
4859 const inst_data = sema.code.instructions.items(.data)[param].str_tok;4859 const inst_data = sema.code.instructions.items(.data)[param].str_tok;
4860 const param_name = inst_data.get(sema.code);4860 const param_name = inst_data.get(sema.code);
4861 const inst = sema.inst_map.get(param).?;4861 const inst = sema.inst_map.get(param).?;
48624862
4863 try sema.addDbgVar(block, inst, .dbg_var_val, param_name);4863 try sema.addDbgVar(&child_block, inst, .dbg_var_val, param_name);
4864 },4864 },
4865 else => continue,4865 else => continue,
4866 };4866 };
src/print_air.zig+2-2
...@@ -386,8 +386,8 @@ const Writer = struct {...@@ -386,8 +386,8 @@ const Writer = struct {
386 }386 }
387387
388 fn writeShuffle(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void {388 fn writeShuffle(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void {
389 const pl_op = w.air.instructions.items(.data)[inst].pl_op;389 const ty_pl = w.air.instructions.items(.data)[inst].ty_pl;
390 const extra = w.air.extraData(Air.Shuffle, pl_op.payload).data;390 const extra = w.air.extraData(Air.Shuffle, ty_pl.payload).data;
391391
392 try w.writeOperand(s, inst, 0, extra.a);392 try w.writeOperand(s, inst, 0, extra.a);
393 try s.writeAll(", ");393 try s.writeAll(", ");