From ee6e9b3c48acea20bae340e59a9406ff433de6e7 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 5 Jan 2022 23:40:53 +0100 Subject: [PATCH] stage2: fix airStructFieldPtr and airStructFieldVal This finally fixes `zig test`. --- src/arch/x86_64/CodeGen.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index 192c892a01..000cd7b005 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -1699,7 +1699,7 @@ fn structFieldPtr(self: *Self, inst: Air.Inst.Index, operand: Air.Inst.Ref, inde switch (mcv) { .ptr_stack_offset => |off| { - const ptr_stack_offset = off - struct_size + struct_field_offset + struct_field_size; + const ptr_stack_offset = off + struct_size - struct_field_offset - struct_field_size; break :result MCValue{ .ptr_stack_offset = ptr_stack_offset }; }, else => return self.fail("TODO implement codegen struct_field_ptr for {}", .{mcv}), @@ -1722,7 +1722,7 @@ fn airStructFieldVal(self: *Self, inst: Air.Inst.Index) !void { switch (mcv) { .stack_offset => |off| { - const stack_offset = off - struct_size + struct_field_offset + struct_field_size; + const stack_offset = off + struct_size - struct_field_offset - struct_field_size; break :result MCValue{ .stack_offset = stack_offset }; }, else => return self.fail("TODO implement codegen struct_field_val for {}", .{mcv}),