Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stage1: Fix crash in *[N]T to []T conversion with zst

Browse Source 
Prevent the crash by not making the codegen try to access the
non-existing ptr field in the slice.

Closes #6951
This commit is contained in:
LemonBoy 2020-11-26 23:07:47 +01:00 committed by Andrew Kelley
parent 3bc1c719bd
commit f91df39ad2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stage1/codegen.cpp
View File

@ -3343,7 +3343,7 @@ static LLVMValueRef ir_render_ptr_of_array_to_slice(CodeGen *g, IrExecutableGen
LLVMValueRef expr_val = ir_llvm_value(g, instruction->operand); LLVMValueRef expr_val = ir_llvm_value(g, instruction->operand);
LLVMValueRef slice_start_ptr = LLVMBuildInBoundsGEP(g->builder, expr_val, indices, 2, ""); LLVMValueRef slice_start_ptr = LLVMBuildInBoundsGEP(g->builder, expr_val, indices, 2, "");
gen_store_untyped(g, slice_start_ptr, ptr_field_ptr, 0, false); gen_store_untyped(g, slice_start_ptr, ptr_field_ptr, 0, false);
} else if (ir_want_runtime_safety(g, &instruction->base)) { } else if (ir_want_runtime_safety(g, &instruction->base) && ptr_index != SIZE_MAX) {
LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, result_loc, ptr_index, ""); LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, result_loc, ptr_index, "");
gen_undef_init(g, slice_ptr_type, slice_ptr_type, ptr_field_ptr); gen_undef_init(g, slice_ptr_type, slice_ptr_type, ptr_field_ptr);
} }

6
test/stage1/behavior/cast.zig
View File

@ -908,3 +908,9 @@ test "cast from ?[*]T to ??[*]T" {
const a: ??[*]u8 = @as(?[*]u8, null); const a: ??[*]u8 = @as(?[*]u8, null);
expect(a != null and a.? == null); expect(a != null and a.? == null);
} }
test "cast between *[N]void and []void" {
var a: [4]void = undefined;
var b: []void = &a;
expect(b.len == 4);
}