refactor: add field member caching to DomainResolver

Signed-off-by: Alexander Linne <alexander.linne@tngtech.com>

Author: alexanderlinne

ArchUnitNET/Loader/DomainResolver.cs

@@ -29,6 +29,9 @@ internal class DomainResolver
         private readonly Dictionary<string, MethodMemberInstance> _allMethods =
             new Dictionary<string, MethodMemberInstance>();
 
+        private readonly Dictionary<string, FieldMember> _allFields =
+            new Dictionary<string, FieldMember>();
+
         public DomainResolver(
             LoadTaskRegistry loadTaskRegistry
         )
@@ -620,33 +623,89 @@ MethodReference methodReference
         }
 
         [NotNull]
-        internal FieldMember CreateStubFieldMemberFromFieldReference(
+        internal FieldMember GetOrCreateFieldMember(
             [NotNull] IType type,
             [NotNull] FieldReference fieldReference
         )
         {
+            var fullName = fieldReference.FullName;
+            if (_allFields.TryGetValue(fullName, out var existing))
+            {
+                return existing;
+            }
+
             var typeReference = fieldReference.FieldType;
             var fieldType = GetOrCreateStubTypeInstanceFromTypeReference(typeReference);
             var isCompilerGenerated = fieldReference.IsCompilerGenerated();
-            bool? isStatic = null;
-            var isReadOnly = false;
+            Visibility visibility;
+            bool? isStatic;
+            Writability writeAccessor;
 
             if (fieldReference is FieldDefinition fieldDefinition)
             {
+                visibility = GetVisibilityFromFieldDefinition(fieldDefinition);
                 isStatic = fieldDefinition.IsStatic;
-                isReadOnly = fieldDefinition.IsInitOnly;
+                writeAccessor = fieldDefinition.IsInitOnly
+                    ? Writability.ReadOnly
+                    : Writability.Writable;
+            }
+            else
+            {
+                visibility = Public;
+                isStatic = null;
+                writeAccessor = Writability.Writable;
             }
 
-            return new FieldMember(
+            var fieldMember = new FieldMember(
                 type,
                 fieldReference.Name,
-                fieldReference.FullName,
-                Public,
+                fullName,
+                visibility,
                 fieldType,
                 isCompilerGenerated,
                 isStatic,
-                isReadOnly ? Writability.ReadOnly : Writability.Writable
+                writeAccessor
             );
+
+            _allFields.Add(fullName, fieldMember);
+            return fieldMember;
+        }
+
+        private static Visibility GetVisibilityFromFieldDefinition(
+            [NotNull] FieldDefinition fieldDefinition
+        )
+        {
+            if (fieldDefinition.IsPublic)
+            {
+                return Public;
+            }
+
+            if (fieldDefinition.IsPrivate)
+            {
+                return Private;
+            }
+
+            if (fieldDefinition.IsFamily)
+            {
+                return Protected;
+            }
+
+            if (fieldDefinition.IsAssembly)
+            {
+                return Internal;
+            }
+
+            if (fieldDefinition.IsFamilyOrAssembly)
+            {
+                return ProtectedInternal;
+            }
+
+            if (fieldDefinition.IsFamilyAndAssembly)
+            {
+                return PrivateProtected;
+            }
+
+            throw new ArgumentException("The field definition seems to have no visibility.");
         }
 
         public IEnumerable<GenericParameter> GetGenericParameters(

ArchUnitNET/Loader/LoadTasks/AddMembers.cs

@@ -1,11 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using ArchUnitNET.Domain;
 using JetBrains.Annotations;
 using Mono.Cecil;
-using static ArchUnitNET.Domain.Visibility;
 
 namespace ArchUnitNET.Loader.LoadTasks
 {
@@ -40,7 +37,9 @@ private IEnumerable<IMember> CreateMembers([NotNull] TypeDefinition typeDefiniti
         {
             return typeDefinition
                 .Fields.Where(fieldDefinition => !fieldDefinition.IsBackingField())
-                .Select(CreateFieldMember)
+                .Select(fieldDef =>
+                    (IMember)_domainResolver.GetOrCreateFieldMember(_typeInstance.Type, fieldDef)
+                )
                 .Concat(
                     typeDefinition
                         .Properties.Select(CreatePropertyMember)
@@ -58,28 +57,6 @@ private IEnumerable<IMember> CreateMembers([NotNull] TypeDefinition typeDefiniti
                 .Where(member => !member.IsCompilerGenerated);
         }
 
-        [NotNull]
-        private IMember CreateFieldMember([NotNull] FieldDefinition fieldDefinition)
-        {
-            var typeReference = fieldDefinition.FieldType;
-            var fieldType = _domainResolver.GetOrCreateStubTypeInstanceFromTypeReference(
-                typeReference
-            );
-            var visibility = GetVisibilityFromFieldDefinition(fieldDefinition);
-            var isCompilerGenerated = fieldDefinition.IsCompilerGenerated();
-            var writeAccessor = GetWriteAccessor(fieldDefinition);
-            return new FieldMember(
-                _typeInstance.Type,
-                fieldDefinition.Name,
-                fieldDefinition.FullName,
-                visibility,
-                fieldType,
-                isCompilerGenerated,
-                fieldDefinition.IsStatic,
-                writeAccessor
-            );
-        }
-
         [NotNull]
         private IMember CreatePropertyMember(PropertyDefinition propertyDefinition)
         {
@@ -103,48 +80,6 @@ private IMember CreatePropertyMember(PropertyDefinition propertyDefinition)
             );
         }
 
-        private static Visibility GetVisibilityFromFieldDefinition(
-            [NotNull] FieldDefinition fieldDefinition
-        )
-        {
-            if (fieldDefinition.IsPublic)
-            {
-                return Public;
-            }
-
-            if (fieldDefinition.IsPrivate)
-            {
-                return Private;
-            }
-
-            if (fieldDefinition.IsFamily)
-            {
-                return Protected;
-            }
-
-            if (fieldDefinition.IsAssembly)
-            {
-                return Internal;
-            }
-
-            if (fieldDefinition.IsFamilyOrAssembly)
-            {
-                return ProtectedInternal;
-            }
-
-            if (fieldDefinition.IsFamilyAndAssembly)
-            {
-                return PrivateProtected;
-            }
-
-            throw new ArgumentException("The field definition seems to have no visibility.");
-        }
-
-        private static Writability GetWriteAccessor([NotNull] FieldDefinition fieldDefinition)
-        {
-            return fieldDefinition.IsInitOnly ? Writability.ReadOnly : Writability.Writable;
-        }
-
         private static Writability GetWriteAccessor([NotNull] PropertyDefinition propertyDefinition)
         {
             bool isReadOnly = propertyDefinition.SetMethod == null;

ArchUnitNET/Loader/MonoCecilMemberExtensions.cs

@@ -250,7 +250,7 @@ DomainResolver domainResolver
                 switch (matchingFieldMembers.Count)
                 {
                     case 0:
-                        var stubFieldMember = domainResolver.CreateStubFieldMemberFromFieldReference(
+                        var stubFieldMember = domainResolver.GetOrCreateFieldMember(
                             declaringType.Type,
                             fieldReference
                         );