mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 03:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage1: fix vectors of small int and bool tripping LLVM assertion

Browse Source 
stage2 already has this fixed; debug info is given size in bits rather
than ABI size (bytes) multiplied by 8.

closes #11587
This commit is contained in:
Andrew Kelley 2022-07-03 21:08:47 -07:00
parent 15bdba410a
commit fdc24e6608
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stage1/analyze.cpp
View File

@ -9368,7 +9368,7 @@ static void resolve_llvm_types_integer(CodeGen *g, ZigType *type) {
}
type->llvm_di_type = ZigLLVMCreateDebugBasicType(g->dbuilder, buf_ptr(&type->name),
type->abi_size * 8, dwarf_tag);
type->size_in_bits, dwarf_tag);
type->llvm_type = LLVMIntType(type->size_in_bits);
}
@ -9932,9 +9932,14 @@ static void resolve_llvm_types(CodeGen *g, ZigType *type, ResolveStatus wanted_r
case ZigTypeIdVector: {
if (type->llvm_di_type != nullptr) return;
type->llvm_type = LLVMVectorType(get_llvm_type(g, type->data.vector.elem_type), type->data.vector.len);
type->llvm_di_type = ZigLLVMDIBuilderCreateVectorType(g->dbuilder, 8 * type->abi_size,
type->abi_align, get_llvm_di_type(g, type->data.vector.elem_type), type->data.vector.len);
type->llvm_type = LLVMVectorType(get_llvm_type(g, type->data.vector.elem_type),
type->data.vector.len);
type->llvm_di_type = ZigLLVMDIBuilderCreateVectorType(g->dbuilder,
8 * type->abi_size,
8 * type->abi_align,
get_llvm_di_type(g, type->data.vector.elem_type),
type->data.vector.len);
return;
}
case ZigTypeIdFnFrame:

5
src/stage1/codegen.cpp
View File

@ -9514,7 +9514,7 @@ static void define_builtin_types(CodeGen *g) {
buf_init_from_str(&entry->name, info->name);
entry->llvm_di_type = ZigLLVMCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
8*LLVMStoreSizeOfType(g->target_data_ref, entry->llvm_type),
size_in_bits,
is_signed ? ZigLLVMEncoding_DW_ATE_signed() : ZigLLVMEncoding_DW_ATE_unsigned());
entry->data.integral.is_signed = is_signed;
entry->data.integral.bit_count = size_in_bits;
@ -9531,8 +9531,7 @@ static void define_builtin_types(CodeGen *g) {
entry->abi_align = LLVMABIAlignmentOfType(g->target_data_ref, entry->llvm_type);
buf_init_from_str(&entry->name, "bool");
entry->llvm_di_type = ZigLLVMCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
8*LLVMStoreSizeOfType(g->target_data_ref, entry->llvm_type),
ZigLLVMEncoding_DW_ATE_boolean());
1, ZigLLVMEncoding_DW_ATE_boolean());
g->builtin_types.entry_bool = entry;
g->primitive_type_table.put(&entry->name, entry);
}