mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13992 from jacobly0/llvm-zwf

Browse Source 
llvm: fix null pointer use when lowering pointer to final zero-width field of a comptime value
This commit is contained in:
Andrew Kelley 2022-12-18 06:50:48 -05:00 committed by GitHub
commit f24c77fc48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/rand/Xoroshiro128.zig
View File

@ -20,7 +20,7 @@ pub fn random(self: *Xoroshiro128) Random {
return Random.init(self, fill);
}
fn next(self: *Xoroshiro128) u64 {
pub fn next(self: *Xoroshiro128) u64 {
const s0 = self.s[0];
var s1 = self.s[1];
const r = s0 +% s1;
@ -33,7 +33,7 @@ fn next(self: *Xoroshiro128) u64 {
}
// Skip 2^64 places ahead in the sequence
fn jump(self: *Xoroshiro128) void {
pub fn jump(self: *Xoroshiro128) void {
var s0: u64 = 0;
var s1: u64 = 0;

4
lib/std/rand/Xoshiro256.zig
View File

@ -22,7 +22,7 @@ pub fn random(self: *Xoshiro256) Random {
return Random.init(self, fill);
}
fn next(self: *Xoshiro256) u64 {
pub fn next(self: *Xoshiro256) u64 {
const r = math.rotl(u64, self.s[0] +% self.s[3], 23) +% self.s[0];
const t = self.s[1] << 17;
@ -40,7 +40,7 @@ fn next(self: *Xoshiro256) u64 {
}
// Skip 2^128 places ahead in the sequence
fn jump(self: *Xoshiro256) void {
pub fn jump(self: *Xoshiro256) void {
var s: u256 = 0;
var table: u256 = 0x39abdc4529b1661ca9582618e03fc9aad5a61266f0c9392c180ec6d33cfd0aba;

22
src/codegen/llvm.zig
View File

@ -4033,16 +4033,24 @@ pub const DeclGen = struct {
const final_llvm_ty = (try dg.lowerType(ptr_child_ty)).pointerType(0);
break :blk field_addr.constIntToPtr(final_llvm_ty);
}
bitcast_needed = !field_ty.eql(ptr_child_ty, dg.module);
var ty_buf: Type.Payload.Pointer = undefined;
const llvm_field_index = llvmFieldIndex(parent_ty, field_index, target, &ty_buf).?;
const indices: [2]*llvm.Value = .{
llvm_u32.constInt(0, .False),
llvm_u32.constInt(llvm_field_index, .False),
};
const parent_llvm_ty = try dg.lowerType(parent_ty);
break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len);
if (llvmFieldIndex(parent_ty, field_index, target, &ty_buf)) |llvm_field_index| {
bitcast_needed = !field_ty.eql(ptr_child_ty, dg.module);
const indices: [2]*llvm.Value = .{
llvm_u32.constInt(0, .False),
llvm_u32.constInt(llvm_field_index, .False),
};
break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len);
} else {
bitcast_needed = !parent_ty.eql(ptr_child_ty, dg.module);
const indices: [1]*llvm.Value = .{
llvm_u32.constInt(1, .False),
};
break :blk parent_llvm_ty.constInBoundsGEP(parent_llvm_ptr, &indices, indices.len);
}
},
.Pointer => {
assert(parent_ty.isSlice());

36
test/behavior/struct.zig
View File

@ -1359,23 +1359,33 @@ test "under-aligned struct field" {
try expect(result == 1234);
}
test "address of zero-bit field is equal to address of only field" {
test "fieldParentPtr of a zero-bit field" {
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
{
const A = struct { b: void = {}, u: u8 };
var a = A{ .u = 0 };
const a_ptr = @fieldParentPtr(A, "b", &a.b);
try std.testing.expectEqual(&a, a_ptr);
}
{
const A = struct { u: u8, b: void = {} };
var a = A{ .u = 0 };
const a_ptr = @fieldParentPtr(A, "b", &a.b);
try std.testing.expectEqual(&a, a_ptr);
}
const S = struct {
fn testOneType(comptime A: type) !void {
{
const a = A{ .u = 0 };
const b_ptr = &a.b;
const a_ptr = @fieldParentPtr(A, "b", b_ptr);
try std.testing.expectEqual(&a, a_ptr);
}
{
var a = A{ .u = 0 };
const b_ptr = &a.b;
const a_ptr = @fieldParentPtr(A, "b", b_ptr);
try std.testing.expectEqual(&a, a_ptr);
}
}
fn doTheTest() !void {
try testOneType(struct { b: void = {}, u: u8 });
try testOneType(struct { u: u8, b: void = {} });
}
};
try S.doTheTest();
comptime try S.doTheTest();
}
test "struct field has a pointer to an aligned version of itself" {