Fixed a bug with method inlineing, fixed #766

Ourpalm · Dec 29, 2023 · af53891 · af53891
1 parent f5b1d95
commit af53891
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ILRuntime/Runtime/Intepreter/RegisterVM/Optimizer.InlineMethod.cs b/ILRuntime/Runtime/Intepreter/RegisterVM/Optimizer.InlineMethod.cs
@@ -18,7 +18,7 @@ partial class Optimizer
         public static void InlineMethod(CodeBasicBlock block, ILMethod method, RegisterVMSymbolLink symbolLink, ref Dictionary<int, int[]> jumpTables, short baseRegIdx, bool hasReturn)
         {
             var ins = block.FinalInstructions;
-            var body = method.BodyRegister;
+            var body = method.BodyRegister.ToArray();
             OpCodeR start = new OpCodeR();
             start.Code = OpCodeREnum.InlineStart;
             ins.Add(start);
@@ -69,23 +69,30 @@ public static void InlineMethod(CodeBasicBlock block, ILMethod method, RegisterV
                         {
                             if (needMove)
                             {
-                                for (int j = branchStart; j < ins.Count; j++)
+                                for (int j = branchStart; j < body.Length + branchStart; j++)
                                 {
-                                    var op2 = ins[j];
+                                    bool isPendingIns = j >= ins.Count;
+                                    var op2 = isPendingIns ? body[j - branchStart] : ins[j];
                                     if (IsBranching(op2.Code))
                                     {
                                         if (op2.Operand > i)
                                         {
                                             op2.Operand++;
-                                            ins[j] = op2;
+                                            if (!isPendingIns)
+                                                ins[j] = op2;
+                                            else
+                                                body[j - branchStart] = op2;
                                         }
                                     }
                                     else if (IsIntermediateBranching(op2.Code))
                                     {
                                         if (op2.Operand4 > i)
                                         {
                                             op2.Operand4++;
-                                            ins[j] = op2;
+                                            if (!isPendingIns)
+                                                ins[j] = op2;
+                                            else
+                                                body[j - branchStart] = op2;
                                         }
                                     }
                                     else if(op2.Code == OpCodeREnum.Switch)