From 0e3feebb042a538405153e4bc75a3bb73ee2e63c Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sun, 18 Dec 2022 22:09:13 -0500 Subject: codegen: fix taking the address of a zero-bit field in a zero-bit struct Normally when we want a pointer to the end of a struct we just add 1 to the struct pointer. However, when it is a zero-bit struct, the pointer type being used during lowering is often a dummy pointer type that actually points to a non-zero-bit type, so we actually want to add 0 instead, since a zero-bit struct begins and ends at the same address. --- src/codegen/llvm.zig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/codegen/llvm.zig') diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 43ffcb0aba..3b180b4c50 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -4046,9 +4046,8 @@ pub const DeclGen = struct { break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len); } else { bitcast_needed = !parent_ty.eql(ptr_child_ty, dg.module); - const indices: [1]*llvm.Value = .{ - llvm_u32.constInt(1, .False), - }; + const llvm_index = llvm_u32.constInt(@boolToInt(parent_ty.hasRuntimeBitsIgnoreComptime()), .False); + const indices: [1]*llvm.Value = .{llvm_index}; break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len); } }, @@ -9774,8 +9773,8 @@ pub const FuncGen = struct { // end of the struct. Treat our struct pointer as an array of two and get // the index to the element at index `1` to get a pointer to the end of // the struct. - const llvm_usize = try self.dg.lowerType(Type.usize); - const llvm_index = llvm_usize.constInt(1, .False); + const llvm_u32 = self.dg.context.intType(32); + const llvm_index = llvm_u32.constInt(@boolToInt(struct_ty.hasRuntimeBitsIgnoreComptime()), .False); const indices: [1]*llvm.Value = .{llvm_index}; return self.builder.buildInBoundsGEP(struct_llvm_ty, struct_ptr, &indices, indices.len, ""); } -- cgit v1.2.3