From 87444ea4ce1162c4f26e60cf0470995092245838 Mon Sep 17 00:00:00 2001
From: Billy Moses <wmoses@google.com>
Date: Sat, 4 Jan 2025 12:11:37 -0500
Subject: [PATCH] Handle same offset in gc fixup

---
 src/llvm/transforms.jl | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/llvm/transforms.jl b/src/llvm/transforms.jl
index 0e019b9ef9..02da055b77 100644
--- a/src/llvm/transforms.jl
+++ b/src/llvm/transforms.jl
@@ -553,6 +553,43 @@ function nodecayed_phis!(mod::LLVM.Module)
                         if all_args
                             continue
                         end
+
+                        all_args = true
+                        addrtodo = Value[inst]
+                        seen = Set{LLVM.Value}()
+
+                        offset = nothing
+
+                        while length(addrtodo) != 0
+                            v = pop!(addrtodo)
+                            base, toffset = get_base_and_offset(v)
+                            if offset === nothing
+                                offset = toffset
+                            else
+                                if offset != toffset
+                                    all_args = false
+                                    break
+                                end
+                            end
+                            if in(base, seen)
+                                continue
+                            end
+                            push!(seen, base)
+                            if isa(base, LLVM.Argument) && addrspace(value_type(base)) == 11
+                                continue
+                            end
+                            if isa(base, LLVM.PHIInst)
+                                for (v, _) in LLVM.incoming(base)
+                                    push!(addrtodo, v)
+                                end
+                                continue
+                            end
+                            all_args = false
+                            break
+                        end
+                        if all_args
+                            continue
+                        end
                     end
 
                     push!(todo, inst)