zig

commit fa5915389640c2b00a093914fd803d7d87dc2e91 (tree)
parent 90084f4ae329c89466bc8c74bd6e00db3f2a3803
Author: kcbanner <kcbanner@gmail.com>
Date:   Sun,  9 Mar 2025 15:44:26 -0400

Value: ensure that extern structs have their layout resolved in ptrField

Diffstat:
M
src/Value.zig
 | 
1
+
M
test/behavior/globals.zig
 | 
28
++++++++++++++++++++++++++++

2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/Value.zig b/src/Value.zig
@@ -3013,6 +3013,7 @@ pub fn ptrField(parent_ptr: Value, field_idx: u32, pt: Zcu.PerThread) !Value {
                 .auto => break :field .{ field_ty, try aggregate_ty.fieldAlignmentSema(field_idx, pt) },
                 .@"extern" => {
                     // Well-defined layout, so just offset the pointer appropriately.
+                    try aggregate_ty.resolveLayout(pt);
                     const byte_off = aggregate_ty.structFieldOffset(field_idx, zcu);
                     const field_align = a: {
                         const parent_align = if (parent_ptr_info.flags.alignment == .none) pa: {
diff --git a/test/behavior/globals.zig b/test/behavior/globals.zig
@@ -171,3 +171,31 @@ test "global var can be indirectly self-referential" {
     try std.testing.expect(S.bar.other == &S.foo);
     try std.testing.expect(S.bar.other.other == &S.bar);
 }
+
+pub const Callbacks = extern struct {
+    key_callback: *const fn (key: i32) callconv(.c) i32,
+};
+
+var callbacks: Callbacks = undefined;
+var callbacks_loaded: bool = false;
+
+test "function pointer field call on global extern struct, conditional on global" {
+    if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
+
+    if (callbacks_loaded) {
+        try std.testing.expectEqual(42, callbacks.key_callback(42));
+    }
+}
+
+test "function pointer field call on global extern struct" {
+    if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
+
+    const S = struct {
+        fn keyCallback(key: i32) callconv(.c) i32 {
+            return key;
+        }
+    };
+
+    callbacks = Callbacks{ .key_callback = S.keyCallback };
+    try std.testing.expectEqual(42, callbacks.key_callback(42));
+}