Fixed reverse ordering of unwind insts in the object file (#6220)

1 files changed, 13 insertions, 4 deletions

diff --git a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs
index 51b4d5468..4a85d860d 100644
--- a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs
+++ b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs
@@ -733,12 +733,21 @@ namespace ILCompiler.DependencyAnalysis
             List<byte[]> cfis;
             if (_offsetToCfis.TryGetValue(offset, out cfis))
             {
-                foreach (byte[] cfi in cfis)
+                if (forArm)
                 {
-                    if (forArm)
-                        EmitARMExIdxCode(offset, cfi);
-                    else
+                    // Unwind insts are generated in the object file in the reversed order on arm,
+                    // so we should reverse the cfi list
+                    for (int index = cfis.Count - 1; index >= 0; index--)
+                    {
+                        EmitARMExIdxCode(offset, cfis[index]);
+                    }
+                }
+                else
+                {
+                    foreach (byte[] cfi in cfis)
+                    {
                         EmitCFICode(offset, cfi);
+                    }
                 }
             }
         }