authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-10-03 20:14:24-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-10-15 11:12:04-04:00
log400319872ba2fd1707a90db232e9c790450f37eb
tree2bd8298f2630393968a90aed0f5252d8a6f0e3ac
parentae39e7867db8053cd0538da10e144bf86bce4eba

llvm: fix bug lowering aggregate_init with a byref sentinel

Closes #12972

3 files changed, 33 insertions(+), 13 deletions(-)

src/codegen/llvm.zig+15-13
...@@ -4355,13 +4355,17 @@ pub const FuncGen = struct {...@@ -4355,13 +4355,17 @@ pub const FuncGen = struct {
4355 const gop = try self.func_inst_table.getOrPut(self.dg.gpa, inst);4355 const gop = try self.func_inst_table.getOrPut(self.dg.gpa, inst);
4356 if (gop.found_existing) return gop.value_ptr.*;4356 if (gop.found_existing) return gop.value_ptr.*;
43574357
4358 const val = self.air.value(inst).?;4358 const llvm_val = try self.resolveValue(.{
4359 const ty = self.air.typeOf(inst);4359 .ty = self.air.typeOf(inst),
4360 const llvm_val = try self.dg.lowerValue(.{ .ty = ty, .val = val });4360 .val = self.air.value(inst).?,
4361 if (!isByRef(ty)) {4361 });
4362 gop.value_ptr.* = llvm_val;4362 gop.value_ptr.* = llvm_val;
4363 return llvm_val;4363 return llvm_val;
4364 }4364 }
4365
4366 fn resolveValue(self: *FuncGen, tv: TypedValue) !*llvm.Value {
4367 const llvm_val = try self.dg.lowerValue(tv);
4368 if (!isByRef(tv.ty)) return llvm_val;
43654369
4366 // We have an LLVM value but we need to create a global constant and4370 // We have an LLVM value but we need to create a global constant and
4367 // set the value as its initializer, and then return a pointer to the global.4371 // set the value as its initializer, and then return a pointer to the global.
...@@ -4371,15 +4375,13 @@ pub const FuncGen = struct {...@@ -4371,15 +4375,13 @@ pub const FuncGen = struct {
4371 global.setLinkage(.Private);4375 global.setLinkage(.Private);
4372 global.setGlobalConstant(.True);4376 global.setGlobalConstant(.True);
4373 global.setUnnamedAddr(.True);4377 global.setUnnamedAddr(.True);
4374 global.setAlignment(ty.abiAlignment(target));4378 global.setAlignment(tv.ty.abiAlignment(target));
4375 // Because of LLVM limitations for lowering certain types such as unions,4379 // Because of LLVM limitations for lowering certain types such as unions,
4376 // the type of global constants might not match the type it is supposed to4380 // the type of global constants might not match the type it is supposed to
4377 // be, and so we must bitcast the pointer at the usage sites.4381 // be, and so we must bitcast the pointer at the usage sites.
4378 const wanted_llvm_ty = try self.dg.lowerType(ty);4382 const wanted_llvm_ty = try self.dg.lowerType(tv.ty);
4379 const wanted_llvm_ptr_ty = wanted_llvm_ty.pointerType(0);4383 const wanted_llvm_ptr_ty = wanted_llvm_ty.pointerType(0);
4380 const casted_ptr = global.constBitCast(wanted_llvm_ptr_ty);4384 return global.constBitCast(wanted_llvm_ptr_ty);
4381 gop.value_ptr.* = casted_ptr;
4382 return casted_ptr;
4383 }4385 }
43844386
4385 fn genBody(self: *FuncGen, body: []const Air.Inst.Index) Error!void {4387 fn genBody(self: *FuncGen, body: []const Air.Inst.Index) Error!void {
...@@ -9032,7 +9034,7 @@ pub const FuncGen = struct {...@@ -9032,7 +9034,7 @@ pub const FuncGen = struct {
9032 llvm_usize.constInt(@intCast(c_uint, array_info.len), .False),9034 llvm_usize.constInt(@intCast(c_uint, array_info.len), .False),
9033 };9035 };
9034 const elem_ptr = self.builder.buildInBoundsGEP(llvm_result_ty, alloca_inst, &indices, indices.len, "");9036 const elem_ptr = self.builder.buildInBoundsGEP(llvm_result_ty, alloca_inst, &indices, indices.len, "");
9035 const llvm_elem = try self.dg.lowerValue(.{9037 const llvm_elem = try self.resolveValue(.{
9036 .ty = array_info.elem_type,9038 .ty = array_info.elem_type,
9037 .val = sent_val,9039 .val = sent_val,
9038 });9040 });
test/behavior.zig+1
...@@ -99,6 +99,7 @@ test {...@@ -99,6 +99,7 @@ test {
99 _ = @import("behavior/bugs/12911.zig");99 _ = @import("behavior/bugs/12911.zig");
100 _ = @import("behavior/bugs/12928.zig");100 _ = @import("behavior/bugs/12928.zig");
101 _ = @import("behavior/bugs/12945.zig");101 _ = @import("behavior/bugs/12945.zig");
102 _ = @import("behavior/bugs/12972.zig");
102 _ = @import("behavior/bugs/12984.zig");103 _ = @import("behavior/bugs/12984.zig");
103 _ = @import("behavior/bugs/13068.zig");104 _ = @import("behavior/bugs/13068.zig");
104 _ = @import("behavior/bugs/13128.zig");105 _ = @import("behavior/bugs/13128.zig");
test/behavior/bugs/12972.zig created+17
...@@ -0,0 +1,17 @@
1const builtin = @import("builtin");
2
3pub fn f(_: [:null]const ?u8) void {}
4
5test {
6 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
7 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
9
10 const c: u8 = 42;
11 f(&[_:null]?u8{c});
12 f(&.{c});
13
14 var v: u8 = 42;
15 f(&[_:null]?u8{v});
16 f(&.{v});
17}