mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-07 14:24:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvm: check that tuple fields have runtime bits

Browse source 
Just checking that they aren't comptime isn't enough for `@Type` constructed tuples.

Closes #13531
This commit is contained in:
Veikka Tuominen 2022-11-12 13:11:54 +02:00
parent a760ce598c
commit 87cf2783eb
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/codegen/llvm.zig
View file

@ -1966,7 +1966,7 @@ pub const Object = struct {
for (tuple.types) |field_ty, i| { for (tuple.types) |field_ty, i| {
const field_val = tuple.values[i]; const field_val = tuple.values[i];
if (field_val.tag() != .unreachable_value) continue; if (field_val.tag() != .unreachable_value or !field_ty.hasRuntimeBits()) continue;
const field_size = field_ty.abiSize(target); const field_size = field_ty.abiSize(target);
const field_align = field_ty.abiAlignment(target); const field_align = field_ty.abiAlignment(target);
@ -2901,7 +2901,7 @@ pub const DeclGen = struct {
for (tuple.types) |field_ty, i| { for (tuple.types) |field_ty, i| {
const field_val = tuple.values[i]; const field_val = tuple.values[i];
if (field_val.tag() != .unreachable_value) continue; if (field_val.tag() != .unreachable_value or !field_ty.hasRuntimeBits()) continue;
const field_align = field_ty.abiAlignment(target); const field_align = field_ty.abiAlignment(target);
big_align = @max(big_align, field_align); big_align = @max(big_align, field_align);
@ -10207,7 +10207,7 @@ fn llvmFieldIndex(
const tuple = ty.tupleFields(); const tuple = ty.tupleFields();
var llvm_field_index: c_uint = 0; var llvm_field_index: c_uint = 0;
for (tuple.types) |field_ty, i| { for (tuple.types) |field_ty, i| {
if (tuple.values[i].tag() != .unreachable_value) continue; if (tuple.values[i].tag() != .unreachable_value or !field_ty.hasRuntimeBits()) continue;
const field_align = field_ty.abiAlignment(target); const field_align = field_ty.abiAlignment(target);
big_align = @max(big_align, field_align); big_align = @max(big_align, field_align);
@ -10771,7 +10771,7 @@ fn isByRef(ty: Type) bool {
const tuple = ty.tupleFields(); const tuple = ty.tupleFields();
var count: usize = 0; var count: usize = 0;
for (tuple.values) |field_val, i| { for (tuple.values) |field_val, i| {
if (field_val.tag() != .unreachable_value) continue; if (field_val.tag() != .unreachable_value or !tuple.types[i].hasRuntimeBits()) continue;
count += 1; count += 1;
if (count > max_fields_byval) return true; if (count > max_fields_byval) return true;

2
src/type.zig
View file

@ -5759,7 +5759,7 @@ pub const Type = extern union {
for (tuple.types) |field_ty, i| { for (tuple.types) |field_ty, i| {
const field_val = tuple.values[i]; const field_val = tuple.values[i];
if (field_val.tag() != .unreachable_value) { if (field_val.tag() != .unreachable_value or !field_ty.hasRuntimeBits()) {
// comptime field // comptime field
if (i == index) return offset; if (i == index) return offset;
continue; continue;

10
test/behavior/tuple.zig
View file

@ -323,3 +323,13 @@ test "zero sized struct in tuple handled correctly" {
var s: State = undefined; var s: State = undefined;
try expect(s.do() == 0); try expect(s.do() == 0);
} }
test "tuple type with void field and a runtime field" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
const T = std.meta.Tuple(&[_]type{ usize, void });
var t: T = .{ 5, {} };
try expect(t[0] == 5);
}