motiejus/zig
1
Fork 0
Code Releases Activity

flip the order of fields in error unions

Browse Source 
to prepare for fixing u128 alignment issues
This commit is contained in:
Andrew Kelley
2019-08-13 11:33:01 -04:00
parent 3aed7de0c4
commit 98183e4743
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/codegen.cpp
View File

@@ -6437,29 +6437,12 @@ static LLVMValueRef gen_const_val(CodeGen *g, ConstExprValue *const_val, const c
err_payload_value = gen_const_val(g, payload_val, "");
make_unnamed_struct = is_llvm_value_unnamed_type(g, payload_val->type, err_payload_value);
}
LLVMValueRef fields[2];
fields[err_union_err_index] = err_tag_value;
fields[err_union_payload_index] = err_payload_value;
if (make_unnamed_struct) {
uint64_t payload_off = LLVMOffsetOfElement(g->target_data_ref, get_llvm_type(g, type_entry), 1);
uint64_t err_sz = LLVMStoreSizeOfType(g->target_data_ref, LLVMTypeOf(err_tag_value));
unsigned pad_sz = payload_off - err_sz;
if (pad_sz == 0) {
LLVMValueRef fields[] = {
err_tag_value,
err_payload_value,
};
return LLVMConstStruct(fields, 2, false);
} else {
LLVMValueRef fields[] = {
err_tag_value,
LLVMGetUndef(LLVMArrayType(LLVMInt8Type(), pad_sz)),
err_payload_value,
};
return LLVMConstStruct(fields, 3, false);
}
return LLVMConstStruct(fields, 2, false);
} else {
LLVMValueRef fields[] = {
err_tag_value,
err_payload_value,
};
return LLVMConstNamedStruct(get_llvm_type(g, type_entry), fields, 2);
}
}