diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-11-21 15:12:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 15:12:03 -0500 |
| commit | 54d196bb300770394fd57db718ff1768edd552f8 (patch) | |
| tree | bea1eab99aeed800b92fc589ad505cb84a86f122 /src/Sema.zig | |
| parent | be6f76655fb355426dc8f3824368376608bc0ba1 (diff) | |
| parent | d63298da65df7fa2712bf9e9d65d36cd91af22fa (diff) | |
| download | zig-54d196bb300770394fd57db718ff1768edd552f8.tar.gz zig-54d196bb300770394fd57db718ff1768edd552f8.zip | |
Merge pull request #18057 from Vexu/fixes
Fix bad error location on field init with field access
Diffstat (limited to 'src/Sema.zig')
| -rw-r--r-- | src/Sema.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index d8f87f50e0..a15699c867 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -9931,7 +9931,7 @@ fn zirStructInitFieldPtr(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Compi const mod = sema.mod; const inst_data = sema.code.instructions.items(.data)[@intFromEnum(inst)].pl_node; const src = inst_data.src(); - const field_name_src: LazySrcLoc = .{ .node_offset_field_name = inst_data.src_node }; + const field_name_src: LazySrcLoc = .{ .node_offset_field_name_init = inst_data.src_node }; const extra = sema.code.extraData(Zir.Inst.Field, inst_data.payload_index).data; const field_name = try mod.intern_pool.getOrPutString(sema.gpa, sema.code.nullTerminatedString(extra.field_name_start)); const object_ptr = try sema.resolveInst(extra.lhs); @@ -19921,7 +19921,7 @@ fn zirStructInitFieldType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Comp const inst_data = sema.code.instructions.items(.data)[@intFromEnum(inst)].pl_node; const extra = sema.code.extraData(Zir.Inst.FieldType, inst_data.payload_index).data; const ty_src = inst_data.src(); - const field_name_src: LazySrcLoc = .{ .node_offset_field_name = inst_data.src_node }; + const field_name_src: LazySrcLoc = .{ .node_offset_field_name_init = inst_data.src_node }; const wrapped_aggregate_ty = sema.resolveType(block, ty_src, extra.container_type) catch |err| switch (err) { // Since this is a ZIR instruction that returns a type, encountering // generic poison should not result in a failed compilation, but the |
