Memory optimization from #919: Autofac.Builder.RegistrationBuilder.

autofac · Aug 16, 2018 · 0a3a081 · 0a3a081
1 parent 26e9606
commit 0a3a081
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/Autofac/Builder/RegistrationBuilder.cs b/src/Autofac/Builder/RegistrationBuilder.cs
@@ -133,7 +133,7 @@ public static class RegistrationBuilder
                 builder.RegistrationStyle.Id,
                 builder.RegistrationData,
                 builder.ActivatorData.Activator,
-                builder.RegistrationData.Services,
+                builder.RegistrationData.Services.ToArray(),
                 builder.RegistrationStyle.Target);
         }
 
@@ -149,7 +149,7 @@ public static class RegistrationBuilder
             Guid id,
             RegistrationData data,
             IInstanceActivator activator,
-            IEnumerable<Service> services)
+            Service[] services)
         {
             return CreateRegistration(id, data, activator, services, null);
         }
@@ -170,7 +170,7 @@ public static class RegistrationBuilder
             Guid id,
             RegistrationData data,
             IInstanceActivator activator,
-            IEnumerable<Service> services,
+            Service[] services,
             IComponentRegistration target)
         {
             if (activator == null) throw new ArgumentNullException(nameof(activator));
@@ -179,9 +179,15 @@ public static class RegistrationBuilder
             var limitType = activator.LimitType;
             if (limitType != typeof(object))
             {
-                foreach (var ts in services.OfType<IServiceWithType>())
+                foreach (var ts in services)
                 {
-                    if (!ts.ServiceType.GetTypeInfo().IsAssignableFrom(limitType.GetTypeInfo()))
+                    var asServiceWithType = ts as IServiceWithType;
+                    if (asServiceWithType == null)
+                    {
+                        continue;
+                    }
+
+                    if (!asServiceWithType.ServiceType.GetTypeInfo().IsAssignableFrom(limitType.GetTypeInfo()))
                     {
                         throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, RegistrationBuilderResources.ComponentDoesNotSupportService, limitType, ts));
                     }

diff --git a/src/Autofac/Features/OpenGenerics/OpenGenericDecoratorRegistrationSource.cs b/src/Autofac/Features/OpenGenerics/OpenGenericDecoratorRegistrationSource.cs
@@ -60,7 +60,7 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(Service service, Fun
             if (registrationAccessor == null) throw new ArgumentNullException(nameof(registrationAccessor));
 
             Type constructedImplementationType;
-            IEnumerable<Service> services;
+            Service[] services;
             if (OpenGenericServiceBinder.TryBindServiceType(service, _registrationData.Services, _activatorData.ImplementationType, out constructedImplementationType, out services))
             {
                 var swt = (IServiceWithType)service;

diff --git a/src/Autofac/Features/OpenGenerics/OpenGenericRegistrationSource.cs b/src/Autofac/Features/OpenGenerics/OpenGenericRegistrationSource.cs
@@ -60,7 +60,7 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(Service service, Fun
             if (registrationAccessor == null) throw new ArgumentNullException(nameof(registrationAccessor));
 
             Type constructedImplementationType;
-            IEnumerable<Service> services;
+            Service[] services;
             if (OpenGenericServiceBinder.TryBindServiceType(service, _registrationData.Services, _activatorData.ImplementationType, out constructedImplementationType, out services))
             {
                 yield return RegistrationBuilder.CreateRegistration(

diff --git a/src/Autofac/Features/OpenGenerics/OpenGenericServiceBinder.cs b/src/Autofac/Features/OpenGenerics/OpenGenericServiceBinder.cs
@@ -41,7 +41,7 @@ internal static class OpenGenericServiceBinder
             IEnumerable<Service> configuredOpenGenericServices,
             Type openGenericImplementationType,
             out Type constructedImplementationType,
-            out IEnumerable<Service> constructedServices)
+            out Service[] constructedServices)
         {
             var swt = service as IServiceWithType;
             if (swt != null && swt.ServiceType.GetTypeInfo().IsGenericType)