motiejus/zig
1
Fork 0
Code Releases Activity

stage1: Fix asyncCall with non-abi-aligned arguments

Browse Source 
Make the code used to calculate the variable slot index into the frame
match what's done during the structure layout calculation.

Prevents a few nasty LLVM errors when such types are passed around.
This commit is contained in:
LemonBoy
2020-11-16 17:55:02 +01:00
committed by Andrew Kelley
parent af4727814b
commit fa27420b72
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/stage1/codegen.cpp
View File

@@ -242,14 +242,24 @@ struct CalcLLVMFieldIndex {
static void calc_llvm_field_index_add(CodeGen *g, CalcLLVMFieldIndex *calc, ZigType *ty) {
if (!type_has_bits(g, ty)) return;
uint32_t ty_align = get_abi_alignment(g, ty);
if (calc->offset % ty_align != 0) {
uint32_t llvm_align = LLVMABIAlignmentOfType(g->target_data_ref, get_llvm_type(g, ty));
if (llvm_align >= ty_align) {
ty_align = llvm_align; // llvm's padding is sufficient
} else if (calc->offset) {
calc->field_index += 1; // zig will insert an extra padding field here
}
calc->offset += ty_align - (calc->offset % ty_align); // padding bytes
// Alignment according to Zig.
uint32_t adj_offset = calc->offset + (ty_align - (calc->offset % ty_align));
// Alignment according to LLVM.
uint32_t adj_llvm_offset = (calc->offset % llvm_align) ?
calc->offset + (llvm_align - (calc->offset % llvm_align)) :
calc->offset;
// Cannot under-align structure fields.
assert(adj_offset >= adj_llvm_offset);
// Zig will insert an extra padding field here.
if (adj_offset != adj_llvm_offset)
calc->field_index += 1;
calc->offset = adj_offset;
}
calc->offset += ty->abi_size;
calc->field_index += 1;