From 0b451b87644358f5e348f8cb9e8351ece48bb2fc Mon Sep 17 00:00:00 2001
From: Benjamin Moir <DaZombieKiller@users.noreply.github.com>
Date: Wed, 10 Jan 2024 03:49:24 +1000
Subject: [PATCH] Improve union detection

---
 src/util/dwarf.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/util/dwarf.rs b/src/util/dwarf.rs
index 89e7122..b6f4a1c 100644
--- a/src/util/dwarf.rs
+++ b/src/util/dwarf.rs
@@ -1429,9 +1429,14 @@ fn get_anon_unions(info: &DwarfInfo, members: &[StructureMember]) -> Result<Vec<
                 continue;
             }
         }
-        if members[prev].offset == member.offset && member.offset != offset {
+        if member.offset <= members[prev].offset && member.offset != offset {
             offset = member.offset;
-            unions.push(AnonUnion { offset, member_index: prev, member_count: 0 });
+            for (i, member) in members.iter().enumerate() {
+                if member.offset == offset {
+                    unions.push(AnonUnion { offset, member_index: i, member_count: 0 });
+                    break;
+                }
+            }
         }
     }
     for anon in &mut unions {