fix

Author: daveMueller

src/coverlet.core/Abstractions/ICecilSymbolHelper.cs

@@ -12,6 +12,5 @@ internal interface ICecilSymbolHelper
   {
     IReadOnlyList<BranchPoint> GetBranchPoints(MethodDefinition methodDefinition);
     bool SkipNotCoverableInstruction(MethodDefinition methodDefinition, Instruction instruction);
-    bool SkipInlineAssignedAutoProperty(bool skipAutoProps, MethodDefinition methodDefinition, Instruction instruction);
   }
 }

src/coverlet.core/Instrumentation/Instrumenter.cs

@@ -592,8 +592,7 @@ private void InstrumentIL(MethodDefinition method)
 
         if (sequencePoint != null && !sequencePoint.IsHidden)
         {
-          if (/*_cecilSymbolHelper.SkipInlineAssignedAutoProperty(_parameters.SkipAutoProps, method,
-                currentInstruction) ||*/ IsInsideExcludedMethodSection(sequencePoint))
+          if (IsInsideExcludedMethodSection(sequencePoint))
           {
             index++;
             continue;

src/coverlet.core/Symbols/CecilSymbolHelper.cs

@@ -1362,61 +1362,6 @@ private bool SkipExpressionBreakpointsSequences(MethodDefinition methodDefinitio
       return false;
     }
 
-    //public bool SkipInlineAssignedAutoProperty(bool skipAutoProps, MethodDefinition methodDefinition, Instruction instruction)
-    //{
-    //  if (!skipAutoProps || !methodDefinition.IsConstructor) return false;
-
-    //  return SkipGeneratedBackingFieldAssignment(methodDefinition, instruction) ||
-    //         SkipDefaultInitializationSystemObject(instruction);
-    //}
-
-    //private static bool SkipGeneratedBackingFieldAssignment(MethodDefinition methodDefinition, Instruction instruction)
-    //{
-    //  /*
-    //      For inline initialization of properties the compiler generates a field that is set in the constructor of the class. 
-    //      To skip this we search for compiler generated fields that are set in the constructor.
-
-    //      .field private string '<SurName>k__BackingField'
-    //      .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = (
-    //          01 00 00 00
-    //      )
-
-    //      .method public hidebysig specialname rtspecialname 
-    //      instance void .ctor () cil managed 
-    //      {
-    //          IL_0000: ldarg.0
-    //          IL_0001: ldsfld    string[System.Runtime] System.String::Empty
-    //          IL_0006: stfld     string TestRepro.ClassWithPropertyInit::'<SurName>k__BackingField'
-    //          ...
-    //      }
-    //      ...
-    //  */
-    //  IEnumerable<FieldDefinition> autogeneratedBackingFields = methodDefinition.DeclaringType.Fields.Where(x =>
-    //      x.CustomAttributes.Any(ca => ca.AttributeType.FullName.Equals(typeof(CompilerGeneratedAttribute).FullName)) &&
-    //      x.FullName.EndsWith("k__BackingField"));
-
-    //  return instruction.OpCode == OpCodes.Ldarg &&
-    //         instruction.Next?.Next?.OpCode == OpCodes.Stfld &&
-    //         instruction.Next?.Next?.Operand is FieldReference fr &&
-    //         autogeneratedBackingFields.Select(x => x.FullName).Contains(fr.FullName);
-    //}
-
-    //private static bool SkipDefaultInitializationSystemObject(Instruction instruction)
-    //{
-    //  /*
-    //      A type always has a constructor with a default instantiation of System.Object. For record types these
-    //      instructions can have a own sequence point. This means that even the default constructor would be instrumented.
-    //      To skip this we search for call instructions with a method reference that declares System.Object.
-
-    //      IL_0000: ldarg.0
-    //      IL_0001: call instance void [System.Runtime]System.Object::.ctor()
-    //      IL_0006: ret
-    //      */
-    //  return instruction.OpCode == OpCodes.Ldarg &&
-    //         instruction.Next?.OpCode == OpCodes.Call &&
-    //         instruction.Next?.Operand is MethodReference mr && mr.DeclaringType.FullName.Equals(typeof(System.Object).FullName);
-    //}
-
     private static bool SkipBranchGeneratedExceptionFilter(Instruction branchInstruction, MethodDefinition methodDefinition)
     {
       if (!methodDefinition.Body.HasExceptionHandlers)

test/coverlet.core.coverage.tests/Samples/Instrumentation.AutoProps.cs

@@ -12,39 +12,4 @@ public AutoProps()
     public int AutoPropsNonInit { get; set; }
     public int AutoPropsInit { get; set; } = 10;
   }
-
-  //public record RecordWithPropertyInit
-  //{
-  //  private int _myRecordVal = 0;
-  //  public RecordWithPropertyInit()
-  //  {
-  //    _myRecordVal = new Random().Next();
-  //  }
-  //  public string RecordAutoPropsNonInit { get; set; }
-  //  public string RecordAutoPropsInit { get; set; } = string.Empty;
-  //}
-
-  //public class ClassWithRecordsAutoProperties
-  //{
-  //  record RecordWithPrimaryConstructor(string Prop1, string Prop2);
-
-  //  public ClassWithRecordsAutoProperties()
-  //  {
-  //    var record = new RecordWithPrimaryConstructor(string.Empty, string.Empty);
-  //  }
-  //}
-
-  //public class ClassWithInheritingRecordsAndAutoProperties
-  //{
-  //  record BaseRecord(int A);
-
-  //  record InheritedRecord(int A) : BaseRecord(A);
-
-  //  public ClassWithInheritingRecordsAndAutoProperties()
-  //  {
-  //    var record = new InheritedRecord(1);
-  //  }
-  //}
-
-
 }