diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen/c.zig | 4 | ||||
| -rw-r--r-- | src/codegen/llvm.zig | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/codegen/c.zig b/src/codegen/c.zig index a7a2b2cf2a..9488fa420b 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -5131,7 +5131,9 @@ fn structFieldPtr(f: *Function, inst: Air.Inst.Index, struct_ptr_ty: Type, struc .begin, .end => { try writer.writeByte('('); try f.writeCValue(writer, struct_ptr, .Other); - try writer.print(")[{}]", .{@boolToInt(field_loc == .end)}); + try writer.print(")[{}]", .{ + @boolToInt(field_loc == .end and struct_ty.hasRuntimeBitsIgnoreComptime()), + }); }, .field => |field| if (extra_name != .none) { try f.writeCValueDerefMember(writer, struct_ptr, extra_name); 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, ""); } |