0.5.1: Revert inline - fixed deferred

oleg-st · Jun 27, 2021 · 1709c7f · 1709c7f
1 parent 1f15271
commit 1709c7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/InlineMethod.Fody/InlineMethodWeaver.cs b/src/InlineMethod.Fody/InlineMethodWeaver.cs
@@ -314,7 +314,12 @@ private void ProcessDeferred()
             {
                 if (_deferredInstruction != null)
                 {
-                    OpCodeHelper.ReplaceInstruction(_deferredInstruction, GetLdArgInstruction());
+                    var ldArgInstruction = GetLdArgInstruction();
+                    OpCodeHelper.ReplaceInstruction(_deferredInstruction, ldArgInstruction);
+                    if (_inlinedInstructions.Count > 0 && _inlinedInstructions[_inlinedInstructions.Count - 1] == ldArgInstruction)
+                    {
+                        _inlinedInstructions[_inlinedInstructions.Count - 1] = _deferredInstruction;
+                    }
                     _deferredInstruction = null;
                 }
             }

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.5</Version>
+    <Version>0.5.1</Version>
   </PropertyGroup>
 
   <ItemGroup>