ifnotnull optimiert

Author: greuelpirat

DeepCopy.Fody/Copy.cs

@@ -44,7 +44,7 @@ private bool TryCopy(PropertyDefinition property, out IEnumerable<Instruction> i
 
             if (property.PropertyType.IsArray)
             {
-                using (new IfNotNull(this, list, source))
+                using (new IfNotNull(list, source))
                     list.AddRange(CopyArray(property));
                 return true;
             }

DeepCopy.Fody/CopyArray.cs

@@ -13,7 +13,6 @@ private IEnumerable<Instruction> CopyArray(PropertyDefinition property)
 
             var loopStart = Instruction.Create(OpCodes.Nop);
             var index = NewVariable(TypeSystem.Int32Definition);
-            var valueCheck = NewVariable(TypeSystem.BooleanDefinition);
             var conditionStart = Instruction.Create(OpCodes.Ldloc, index);
 
             var list = new List<Instruction>
@@ -49,10 +48,8 @@ private IEnumerable<Instruction> CopyArray(PropertyDefinition property)
             list.Add(Instruction.Create(OpCodes.Ldlen));
             list.Add(Instruction.Create(OpCodes.Conv_I4));
             list.Add(Instruction.Create(OpCodes.Clt));
-            list.Add(Instruction.Create(OpCodes.Stloc, valueCheck));
 
             // loop end
-            list.Add(Instruction.Create(OpCodes.Ldloc, valueCheck));
             list.Add(Instruction.Create(OpCodes.Brtrue_S, loopStart));
 
             return list;

DeepCopy.Fody/CopyDictionary.cs

@@ -13,7 +13,7 @@ private IEnumerable<Instruction> CopyDictionary(TypeReference type, ValueSource
             var typeKeyValuePair = ImportType(typeof(KeyValuePair<,>), typesOfArguments);
 
             var list = new List<Instruction>();
-            using (new IfNotNull(this, list, source, target.IsTargetingBase))
+            using (new IfNotNull(list, source, target.IsTargetingBase))
             {
                 VariableDefinition variable = null;
                 if (!target.IsTargetingBase)

DeepCopy.Fody/CopyList.cs

@@ -13,7 +13,7 @@ private IEnumerable<Instruction> CopyList(TypeReference type, ValueSource source
             var typeOfArgument = type.GetGenericArguments().Single();
 
             var list = new List<Instruction>();
-            using (new IfNotNull(this, list, source, target.IsTargetingBase))
+            using (new IfNotNull(list, source, target.IsTargetingBase))
             {
                 VariableDefinition variable = null;
                 if (!target.IsTargetingBase)

DeepCopy.Fody/CopySet.cs

@@ -13,7 +13,7 @@ private IEnumerable<Instruction> CopySet(TypeReference type, ValueSource source,
             var typeOfArgument = type.GetGenericArguments().Single();
 
             var list = new List<Instruction>();
-            using (new IfNotNull(this, list, source, target.IsTargetingBase))
+            using (new IfNotNull(list, source, target.IsTargetingBase))
             {
                 VariableDefinition variable = null;
                 if (!target.IsTargetingBase)

DeepCopy.Fody/DeepCopyMethodExtension.cs

@@ -70,8 +70,6 @@ private void BuildMultiTypeSwitchMethodBody(MethodDefinition method, TypeDefinit
         {
             var body = method.Body;
             body.InitLocals = true;
-            body.Variables.Add(new VariableDefinition(TypeSystem.BooleanDefinition));
-            body.Variables.Add(new VariableDefinition(baseType));
             body.Instructions.Clear();
 
             var processor = body.GetILProcessor();
@@ -82,12 +80,8 @@ private void BuildMultiTypeSwitchMethodBody(MethodDefinition method, TypeDefinit
             processor.Emit(OpCodes.Ldarg_0);
             processor.Emit(OpCodes.Ldnull);
             processor.Emit(OpCodes.Ceq);
-            processor.Emit(OpCodes.Stloc_0);
-            processor.Emit(OpCodes.Ldloc_0);
             processor.Emit(OpCodes.Brfalse_S, startType);
             processor.Emit(OpCodes.Ldnull);
-            processor.Emit(OpCodes.Stloc_1);
-            processor.Emit(OpCodes.Ldloc_1);
             processor.Emit(OpCodes.Ret);
 
             var copiedTypes = new List<TypeDefinition>();
@@ -120,8 +114,6 @@ private void BuildMultiTypeSwitchMethodBody(MethodDefinition method, TypeDefinit
                 processor.Emit(OpCodes.Ldloc, variable);
 
                 processor.Emit(OpCodes.Newobj, constructor);
-                processor.Emit(OpCodes.Stloc_1);
-                processor.Emit(OpCodes.Ldloc_1);
                 processor.Emit(OpCodes.Ret);
 
                 processor.Append(endType);

DeepCopy.Fody/Utils/IfNotNull.cs

@@ -9,24 +9,22 @@ public class IfNotNull : IDisposable
         private readonly Instruction _last;
         private readonly IList<Instruction> _instructions;
 
-        public IfNotNull(ModuleWeaver moduleWeaver, List<Instruction> instructions, ValueSource source, bool skip = false)
+        public IfNotNull(List<Instruction> instructions, ValueSource source, bool skip = false)
         {
+            if (skip)
+                return;
             _instructions = instructions;
             _last = Instruction.Create(OpCodes.Nop);
 
-            var nullCheck = moduleWeaver.NewVariable(moduleWeaver.TypeSystem.BooleanDefinition);
-
             instructions.AddRange(source);
             instructions.Add(Instruction.Create(OpCodes.Ldnull));
             instructions.Add(Instruction.Create(OpCodes.Cgt_Un));
-            instructions.Add(Instruction.Create(OpCodes.Stloc, nullCheck));
-            instructions.Add(Instruction.Create(OpCodes.Ldloc, nullCheck));
             instructions.Add(Instruction.Create(OpCodes.Brfalse, _last));
         }
 
         public void Dispose()
         {
-            _instructions.Add(_last);
+            _instructions?.Add(_last);
         }
     }
 }