authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-24 10:42:43-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2018-08-24 10:42:43-04:00
log0a918aaa14edea5edb456e2171d932f999fc1af5
treecd54d901efa9a8e0fc200ff99f5b4ae89d031d4a
parent3a02ba9b82faf2521af22857554690fbacc7fa8e
parent05f9b14fc2d9950a1dd9a83d607ca2061711498b
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #1407 from ziglang/builtin-alignment-fix

Fix builtin alignment type

2 files changed, 2 insertions(+), 2 deletions(-)

doc/langref.html.in+1-1
......@@ -6166,7 +6166,7 @@ pub const TypeInfo = union(TypeId) {
61666166 size: Size,
61676167 is_const: bool,
61686168 is_volatile: bool,
6169 alignment: u32,
6169 alignment: u29,
61706170 child: type,
61716171
61726172 pub const Size = enum {
src/ir.cpp+1-1
......@@ -17125,7 +17125,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, TypeTableEntry *t
1712517125 // alignment: u32
1712617126 ensure_field_index(result->type, "alignment", 3);
1712717127 fields[3].special = ConstValSpecialStatic;
17128 fields[3].type = ira->codegen->builtin_types.entry_u32;
17128 fields[3].type = get_int_type(ira->codegen, false, 29);
1712917129 bigint_init_unsigned(&fields[3].data.x_bigint, attrs_type->data.pointer.alignment);
1713017130 // child: type
1713117131 ensure_field_index(result->type, "child", 4);