From e19b5a150a3db28275fddcd65073b706547cef20 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 3 Apr 2025 14:56:09 -0400
Subject: [PATCH] libghostty: Action CValue should be untagged extern union

Fixes #6962

I believe this is an upstream bug
(https://github.com/ziglang/zig/issues/23454), where Zig is allowing
extern unions to be tagged when created via type reification. This
results in a CValue that has an extra trailing byte (the tag).

This wasn't causing any noticeable issues for Ghostty for some reason
but others using our pattern were seeing issues. And I did confirm that
our CValue was indeed tagged and was the wrong byte size. I assume Swift
was just ignoring it because it was extra data. I don't know, but we
should fix this in general for libghostty.
---
 src/apprt/action.zig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/apprt/action.zig b/src/apprt/action.zig
index 2ddbee524..30cb2fa5e 100644
--- a/src/apprt/action.zig
+++ b/src/apprt/action.zig
@@ -311,7 +311,7 @@ pub const Action = union(Key) {
 
         break :cvalue @Type(.{ .@"union" = .{
             .layout = .@"extern",
-            .tag_type = Key,
+            .tag_type = null,
             .fields = &union_fields,
             .decls = &.{},
         } });
@@ -323,6 +323,13 @@ pub const Action = union(Key) {
         value: CValue,
     };
 
+    comptime {
+        // For ABI compatibility, we expect that this is our union size.
+        // At the time of writing, we don't promise ABI compatibility
+        // so we can change this but I want to be aware of it.
+        assert(@sizeOf(CValue) == 16);
+    }
+
     /// Returns the value type for the given key.
     pub fn Value(comptime key: Key) type {
         inline for (@typeInfo(Action).@"union".fields) |field| {