Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/Sema.zig
Original file line number Diff line number Diff line change
Expand Up @@ -26652,8 +26652,9 @@ fn finishFieldCallBind(

const container_ty = ptr_ty.childType(mod);
if (container_ty.zigTypeTag(mod) == .Struct) {
try sema.resolveStructFieldInits(container_ty);
if (try container_ty.structFieldValueComptime(mod, field_index)) |default_val| {
if (container_ty.structFieldIsComptime(field_index, mod)) {
try sema.resolveStructFieldInits(container_ty);
const default_val = (try container_ty.structFieldValueComptime(mod, field_index)).?;
return .{ .direct = Air.internedToRef(default_val.toIntern()) };
}
}
Expand Down
15 changes: 15 additions & 0 deletions test/behavior/struct.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1842,3 +1842,18 @@ test "circular dependency through pointer field of a struct" {
try expect(outer.middle.outer == null);
try expect(outer.middle.inner == null);
}

test "field calls do not force struct field init resolution" {
const S = struct {
x: u32 = blk: {
_ = @TypeOf(make().dummyFn()); // runtime field call - S not fully resolved - dummyFn call should not force field init resolution
break :blk 123;
},
dummyFn: *const fn () void = undefined,
fn make() @This() {
return .{};
}
};
var s: S = .{};
try expect(s.x == 123);
}