Fix nested aggregate size calculation on AMD64
authorRobert Pengelly <robertapengelly@hotmail.com>
Wed, 7 Oct 2026 06:54:26 +0000 (07:54 +0100)
committerRobert Pengelly <robertapengelly@hotmail.com>
Wed, 7 Oct 2026 06:54:26 +0000 (07:54 +0100)
amd64.c

diff --git a/amd64.c b/amd64.c
index 3fed444eb4f01d47f25692e3d44760c32a751795..bbfd845b550fbfca0a4e70d3743835e1fea31c32 100644 (file)
--- a/amd64.c
+++ b/amd64.c
@@ -286,7 +286,11 @@ static int amd64_relayout_aggregate_members (int owner_size, const char *owner_t
         
         }
         
-        size = member_infos[mi].is_array ? member_infos[mi].size : (member_infos[mi].size & 0x1f);
+        if (!member_infos[mi].is_array && !member_infos[mi].tag_name) {
+            size = member_infos[mi].size & 0x1f;
+        } else {
+            size = member_infos[mi].size;
+        }
         
         if (size <= 0) {
             size = DATA_INT & 0x1f;