Skip to content

add missing resolveStructFieldInits #18436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2024
Merged

add missing resolveStructFieldInits #18436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Sema.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5041,6 +5041,8 @@ fn zirValidatePtrArrayInit(
// Determine whether the value stored to this pointer is comptime-known.

if (array_ty.isTuple(mod)) {
if (array_ty.structFieldIsComptime(i, mod))
try sema.resolveStructFieldInits(array_ty);
if (try array_ty.structFieldValueComptime(mod, i)) |opv| {
element_vals[i] = opv.toIntern();
continue;
Expand Down Expand Up @@ -27056,6 +27058,8 @@ fn tupleFieldValByIndex(
const mod = sema.mod;
const field_ty = tuple_ty.structFieldType(field_index, mod);

if (tuple_ty.structFieldIsComptime(field_index, mod))
try sema.resolveStructFieldInits(tuple_ty);
if (try tuple_ty.structFieldValueComptime(mod, field_index)) |default_value| {
return Air.internedToRef(default_value.toIntern());
}
Expand All @@ -27075,10 +27079,6 @@ fn tupleFieldValByIndex(
};
}

if (try tuple_ty.structFieldValueComptime(mod, field_index)) |default_val| {
return Air.internedToRef(default_val.toIntern());
}

try sema.requireRuntimeBlock(block, src, null);
try sema.resolveTypeLayout(field_ty);
return block.addStructFieldVal(tuple_byval, field_index, field_ty);
Expand Down Expand Up @@ -27503,6 +27503,8 @@ fn tupleFieldPtr(
},
});

if (tuple_ty.structFieldIsComptime(field_index, mod))
try sema.resolveStructFieldInits(tuple_ty);
if (try tuple_ty.structFieldValueComptime(mod, field_index)) |default_val| {
return Air.internedToRef((try mod.intern(.{ .ptr = .{
.ty = ptr_field_ty.toIntern(),
Expand Down Expand Up @@ -27553,6 +27555,8 @@ fn tupleField(

const field_ty = tuple_ty.structFieldType(field_index, mod);

if (tuple_ty.structFieldIsComptime(field_index, mod))
try sema.resolveStructFieldInits(tuple_ty);
if (try tuple_ty.structFieldValueComptime(mod, field_index)) |default_value| {
return Air.internedToRef(default_value.toIntern()); // comptime field
}
Expand Down
8 changes: 8 additions & 0 deletions test/behavior/tuple.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,3 +480,11 @@ test "empty tuple type" {
const s: S = .{};
try expect(s.len == 0);
}

test "tuple with comptime fields with non empty initializer" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;

const a: struct { comptime comptime_int = 0 } = .{0};
_ = a;
}