diff options
| author | mlugg <mlugg@mlugg.co.uk> | 2023-11-08 19:32:32 +0000 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2023-11-08 23:47:10 -0700 |
| commit | 997eaf6d8724fe2076195de4d6d54bf2bf880eea (patch) | |
| tree | d423bc12df1141b2f8029f7a88e4f0f56413a316 /src | |
| parent | f258a391daa31b3ba2c37d879db96fadc0c058f3 (diff) | |
| download | zig-997eaf6d8724fe2076195de4d6d54bf2bf880eea.tar.gz zig-997eaf6d8724fe2076195de4d6d54bf2bf880eea.zip | |
Sema: do not force resolution of struct field inits when calling function pointer field
b3462b7 caused a regression in a third-party project, since it forced
resolution of field initializers for any field call 'foo.bar()', despite
this only being necessary when 'bar' is a comptime field.
See https://github.com/ziglang/zig/pull/17692#issuecomment-1802096734.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Sema.zig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Sema.zig b/src/Sema.zig index 8e34c9e4dc..c603fcdea4 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -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()) }; } } |