diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Sema.zig | 7 | ||||
| -rw-r--r-- | src/type.zig | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index b202cb696f..df5013fbaf 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -9651,6 +9651,11 @@ fn zirTypeInfo(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai }, .Pointer => { const info = ty.ptrInfo().data; + const alignment = if (info.@"align" != 0) + info.@"align" + else + info.pointee_type.abiAlignment(target); + const field_values = try sema.arena.alloc(Value, 8); // size: Size, field_values[0] = try Value.Tag.enum_field_index.create(sema.arena, @enumToInt(info.size)); @@ -9659,7 +9664,7 @@ fn zirTypeInfo(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai // is_volatile: bool, field_values[2] = if (info.@"volatile") Value.@"true" else Value.@"false"; // alignment: comptime_int, - field_values[3] = try Value.Tag.int_u64.create(sema.arena, info.@"align"); + field_values[3] = try Value.Tag.int_u64.create(sema.arena, alignment); // address_space: AddressSpace field_values[4] = try Value.Tag.enum_field_index.create(sema.arena, @enumToInt(info.@"addrspace")); // child: type, diff --git a/src/type.zig b/src/type.zig index e3a4b3d60a..769e48ccc5 100644 --- a/src/type.zig +++ b/src/type.zig @@ -4687,7 +4687,7 @@ pub const Type = extern union { pub const Data = struct { pointee_type: Type, sentinel: ?Value = null, - /// If zero use pointee_type.AbiAlign() + /// If zero use pointee_type.abiAlignment() @"align": u32 = 0, /// See src/target.zig defaultAddressSpace function for how to obtain /// an appropriate value for this field. |