0.5: Revert inline

oleg-st · Jun 25, 2021 · 1f15271 · 1f15271
1 parent ba94437
commit 1f15271
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/InlineMethod.Fody/Helper/OpCodeHelper.cs b/src/InlineMethod.Fody/Helper/OpCodeHelper.cs
@@ -316,5 +316,11 @@ public static IEnumerable<Instruction> GetTargets(Instruction instruction)
                 }
             }
         }
+
+        public static void ReplaceInstruction(Instruction target, Instruction source)
+        {
+            target.OpCode = source.OpCode;
+            target.Operand = source.Operand;
+        }
     }
 }
diff --git a/src/InlineMethod.Fody/InlineMethodWeaver.cs b/src/InlineMethod.Fody/InlineMethodWeaver.cs
@@ -287,12 +287,24 @@ public void Finish()
             private bool CanInline => _pushInstruction != null && _variableDefinition == null && 
                                       (OpCodeHelper.IsLoadConst(_pushInstruction) || OpCodeHelper.IsLoadArg(_pushInstruction) || OpCodeHelper.IsLoadLoc(_pushInstruction));
 
+            private readonly List<Instruction> _inlinedInstructions = new List<Instruction>();
+
             private VariableDefinition GetVariableDefinition()
             {
                 if (_variableDefinition == null)
                 {
                     _variableDefinition = new VariableDefinition(_inlineMethodWeaver._parameters[_paramIndex].ParameterType);
                     _inlineMethodWeaver._parentMethod.Body.Variables.Add(_variableDefinition);
+
+                    // revert inline
+                    if (_inlinedInstructions.Count > 0)
+                    {
+                        foreach (var inlinedInstruction in _inlinedInstructions)
+                        {
+                            OpCodeHelper.ReplaceInstruction(inlinedInstruction, OpCodeHelper.CreateLoadLoc(_variableDefinition));
+                        }
+                        _inlinedInstructions.Clear();
+                    }
                 }
 
                 return _variableDefinition;
@@ -302,9 +314,7 @@ private void ProcessDeferred()
             {
                 if (_deferredInstruction != null)
                 {
-                    var newInstruction =  GetLdArgInstruction();
-                    _deferredInstruction.OpCode = newInstruction.OpCode;
-                    _deferredInstruction.Operand = newInstruction.Operand;
+                    OpCodeHelper.ReplaceInstruction(_deferredInstruction, GetLdArgInstruction());
                     _deferredInstruction = null;
                 }
             }
@@ -319,7 +329,9 @@ private Instruction GetLdArgInstruction()
             {
                 if (CanInline)
                 {
-                    return OpCodeHelper.Clone(_pushInstruction);
+                    var ldArgInstruction = OpCodeHelper.Clone(_pushInstruction);
+                    _inlinedInstructions.Add(ldArgInstruction);
+                    return ldArgInstruction;
                 }
                 return OpCodeHelper.CreateLoadLoc(GetVariableDefinition());
             }

diff --git a/src/InlineMethod/InlineMethod.csproj b/src/InlineMethod/InlineMethod.csproj
@@ -12,7 +12,7 @@
     <PackageOutputPath>$(SolutionDir)/../nugets</PackageOutputPath>
     <PackageProjectUrl>https://github.com/oleg-st/InlineMethod.Fody</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>0.4</Version>
+    <Version>0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>