authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-04 17:45:21-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-12-04 17:45:21-05:00
logfe39ca01bcbee0077b21d5ddc2776df974e8c6d3
tree1bb4775c795f8c15887e85fd3b6aeb3f2fe1b36c
parent42004f9013ba2d06b457f858e0e269ef4ad23554
parent5ebed1c9eeff6a190ff3d603bc6c680d4b920bd8

Merge remote-tracking branch 'origin/master' into llvm6

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

src/codegen.cpp+1-1
...@@ -3964,7 +3964,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val) {...@@ -3964,7 +3964,7 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val) {
3964 if (type_entry->data.unionation.gen_tag_index == SIZE_MAX)3964 if (type_entry->data.unionation.gen_tag_index == SIZE_MAX)
3965 return LLVMGetUndef(type_entry->type_ref);3965 return LLVMGetUndef(type_entry->type_ref);
39663966
3967 union_value_ref = LLVMGetUndef(type_entry->data.unionation.most_aligned_union_member->type_ref);3967 union_value_ref = LLVMGetUndef(union_type_ref);
3968 make_unnamed_struct = false;3968 make_unnamed_struct = false;
3969 } else {3969 } else {
3970 uint64_t field_type_bytes = LLVMStoreSizeOfType(g->target_data_ref, payload_value->type->type_ref);3970 uint64_t field_type_bytes = LLVMStoreSizeOfType(g->target_data_ref, payload_value->type->type_ref);