authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-03-29 21:22:14-04:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2023-03-30 11:54:24+03:00
log0543def52f5ec2d76dc415da2546e478af491ac3
treecd08fe58ac0bf9f030a9f079ad5dff2ab1d0f002
parentff97bd21c3b6a5079f33ff389da0716a12806e29

llvm: fix crashes when loading a struct field

The result of buildStructGEP is not always a GEP (sorry), so we can't use getGEPResultElementType on it. Closes #14641

5 files changed, 14 insertions(+), 12 deletions(-)

src/codegen/llvm.zig+3-3
......@@ -5558,7 +5558,7 @@ pub const FuncGen = struct {
55585558
55595559 return fg.loadByRef(payload_ptr, payload_ty, payload_ty.abiAlignment(target), false);
55605560 }
5561 const load_inst = fg.builder.buildLoad(payload_ptr.getGEPResultElementType(), payload_ptr, "");
5561 const load_inst = fg.builder.buildLoad(err_union_llvm_ty.structGetTypeAtIndex(offset), payload_ptr, "");
55625562 load_inst.setAlignment(payload_ty.abiAlignment(target));
55635563 return load_inst;
55645564 }
......@@ -6792,7 +6792,7 @@ pub const FuncGen = struct {
67926792
67936793 return self.loadByRef(payload_ptr, payload_ty, payload_ty.abiAlignment(target), false);
67946794 }
6795 const load_inst = self.builder.buildLoad(payload_ptr.getGEPResultElementType(), payload_ptr, "");
6795 const load_inst = self.builder.buildLoad(err_union_llvm_ty.structGetTypeAtIndex(offset), payload_ptr, "");
67966796 load_inst.setAlignment(payload_ty.abiAlignment(target));
67976797 return load_inst;
67986798 }
......@@ -8580,7 +8580,7 @@ pub const FuncGen = struct {
85808580 }
85818581 const tag_index = @boolToInt(layout.tag_align < layout.payload_align);
85828582 const tag_field_ptr = self.builder.buildStructGEP(llvm_un_ty, union_handle, tag_index, "");
8583 return self.builder.buildLoad(tag_field_ptr.getGEPResultElementType(), tag_field_ptr, "");
8583 return self.builder.buildLoad(llvm_un_ty.structGetTypeAtIndex(tag_index), tag_field_ptr, "");
85848584 } else {
85858585 if (layout.payload_size == 0) {
85868586 return union_handle;
src/codegen/llvm/bindings.zig-3
......@@ -254,9 +254,6 @@ pub const Value = opaque {
254254 pub const addFunctionAttr = ZigLLVMAddFunctionAttr;
255255 extern fn ZigLLVMAddFunctionAttr(Fn: *Value, attr_name: [*:0]const u8, attr_value: [*:0]const u8) void;
256256
257 pub const getGEPResultElementType = ZigLLVMGetGEPResultElementType;
258 extern fn ZigLLVMGetGEPResultElementType(GEP: *Value) *Type;
259
260257 pub const addByValAttr = ZigLLVMAddByValAttr;
261258 extern fn ZigLLVMAddByValAttr(Fn: *Value, ArgNo: c_uint, type: *Type) void;
262259};
src/zig_llvm.cpp-4
......@@ -1239,10 +1239,6 @@ void ZigLLVMSetCallElemTypeAttr(LLVMValueRef Call, size_t arg_index, LLVMTypeRef
12391239 Attribute::get(call_inst->getContext(), Attribute::ElementType, llvm_type));
12401240}
12411241
1242LLVMTypeRef ZigLLVMGetGEPResultElementType(LLVMValueRef GEP) {
1243 return wrap(unwrap<GEPOperator>(GEP)->getResultElementType());
1244}
1245
12461242void ZigLLVMFunctionSetPrefixData(LLVMValueRef function, LLVMValueRef data) {
12471243 unwrap<Function>(function)->setPrefixData(unwrap<Constant>(data));
12481244}
src/zig_llvm.h-2
......@@ -332,8 +332,6 @@ ZIG_EXTERN_C void ZigLLVMAddSretAttr(LLVMValueRef fn_ref, LLVMTypeRef type_val);
332332ZIG_EXTERN_C void ZigLLVMAddFunctionElemTypeAttr(LLVMValueRef fn_ref, size_t arg_index, LLVMTypeRef elem_ty);
333333ZIG_EXTERN_C void ZigLLVMAddFunctionAttrCold(LLVMValueRef fn);
334334
335ZIG_EXTERN_C LLVMTypeRef ZigLLVMGetGEPResultElementType(LLVMValueRef GEP);
336
337335ZIG_EXTERN_C void ZigLLVMParseCommandLineOptions(size_t argc, const char *const *argv);
338336
339337
test/behavior/union.zig+11
......@@ -1529,3 +1529,14 @@ test "reinterpreting enum value inside packed union" {
15291529 try U.doTest();
15301530 comptime try U.doTest();
15311531}
1532
1533test "access the tag of a global tagged union" {
1534 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1535
1536 const U = union(enum) {
1537 a,
1538 b: u8,
1539 var u: @This() = .a;
1540 };
1541 try expect(U.u == .a);
1542}