Merge pull request #1397 from SergeiPavlov/struct_ResolveRequest

Optimization: convert `ResolveRequest` into readonly struct

Author: tillig

src/Autofac/Core/Container.cs

@@ -140,7 +140,7 @@ public event EventHandler<ResolveOperationBeginningEventArgs> ResolveOperationBe
     public IComponentRegistry ComponentRegistry { get; }
 
     /// <inheritdoc />
-    public object ResolveComponent(ResolveRequest request)
+    public object ResolveComponent(in ResolveRequest request)
     {
         return _rootLifetimeScope.ResolveComponent(request);
     }

src/Autofac/Core/ImplicitRegistrationSource.cs

@@ -86,7 +86,7 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(Service service, Fun
     /// <param name="ctx">A component context to resolve services.</param>
     /// <param name="request">A resolve request.</param>
     /// <returns>An implicit type instance.</returns>
-    protected abstract object ResolveInstance<T>(IComponentContext ctx, ResolveRequest request)
+    protected abstract object ResolveInstance<T>(IComponentContext ctx, in ResolveRequest request)
         where T : notnull;
 
     /// <summary>

src/Autofac/Core/Lifetime/LifetimeScope.cs

@@ -323,13 +323,8 @@ private ComponentRegistryBuilder CreateScopeRestrictedRegistry(object tag, Actio
     }
 
     /// <inheritdoc />
-    public object ResolveComponent(ResolveRequest request)
+    public object ResolveComponent(in ResolveRequest request)
     {
-        if (request == null)
-        {
-            throw new ArgumentNullException(nameof(request));
-        }
-
         CheckNotDisposed();
 
         var operation = new ResolveOperation(this, DiagnosticSource);

src/Autofac/Core/Resolving/IResolveOperation.cs

@@ -59,5 +59,5 @@ public interface IResolveOperation
     /// <param name="currentOperationScope">The scope in the hierarchy in which the operation will begin.</param>
     /// <param name="request">The resolve request.</param>
     /// <returns>The component instance.</returns>
-    object GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request);
+    object GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, in ResolveRequest request);
 }

src/Autofac/Core/Resolving/Pipeline/DefaultResolveRequestContext.cs

@@ -25,14 +25,14 @@ internal sealed class DefaultResolveRequestContext : ResolveRequestContext
     /// </param>
     internal DefaultResolveRequestContext(
         IResolveOperation owningOperation,
-        ResolveRequest request,
+        in ResolveRequest request,
         ISharingLifetimeScope scope,
         DiagnosticListener diagnosticSource)
     {
         Operation = owningOperation;
         ActivationScope = scope;
         Parameters = request.Parameters;
-        _resolveRequest = request ?? throw new ArgumentNullException(nameof(request));
+        _resolveRequest = request;
         PhaseReached = PipelinePhase.ResolveRequestStart;
         DiagnosticSource = diagnosticSource;
     }
@@ -90,7 +90,7 @@ public override void ChangeParameters(IEnumerable<Parameter> newParameters) =>
         Parameters = newParameters ?? throw new ArgumentNullException(nameof(newParameters));
 
     /// <inheritdoc />
-    public override object ResolveComponent(ResolveRequest request) =>
+    public override object ResolveComponent(in ResolveRequest request) =>
         Operation.GetOrCreateInstance(ActivationScope, request);
 
     /// <summary>

src/Autofac/Core/Resolving/Pipeline/ResolveRequestContext.cs

@@ -95,5 +95,5 @@ public abstract class ResolveRequestContext : IComponentContext
     public abstract IComponentRegistry ComponentRegistry { get; }
 
     /// <inheritdoc/>
-    public abstract object ResolveComponent(ResolveRequest request);
+    public abstract object ResolveComponent(in ResolveRequest request);
 }

src/Autofac/Core/Resolving/ResolveOperation.cs

@@ -42,7 +42,7 @@ public ResolveOperation(
     /// Execute the complete resolve operation.
     /// </summary>
     /// <param name="request">The resolution context.</param>
-    public object Execute(ResolveRequest request)
+    public object Execute(in ResolveRequest request)
     {
         return ExecuteOperation(request);
     }
@@ -93,13 +93,8 @@ public object Execute(ResolveRequest request)
     public SegmentedStack<ResolveRequestContext> RequestStack { get; } = new SegmentedStack<ResolveRequestContext>();
 
     /// <inheritdoc />
-    public object GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request)
+    public object GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, in ResolveRequest request)
     {
-        if (request is null)
-        {
-            throw new ArgumentNullException(nameof(request));
-        }
-
         if (_ended)
         {
             throw new ObjectDisposedException(ResolveOperationResources.TemporaryContextDisposed, innerException: null);
@@ -170,7 +165,7 @@ public object GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, R
     /// </summary>
     /// <param name="request">The resolve request.</param>
     /// <returns>The resolved instance.</returns>
-    private object ExecuteOperation(ResolveRequest request)
+    private object ExecuteOperation(in ResolveRequest request)
     {
         object result;
 
@@ -233,7 +228,7 @@ private object ExecuteOperation(ResolveRequest request)
     /// to enable it to be optionally surrounded with diagnostics.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private void InvokePipeline(ResolveRequest request, DefaultResolveRequestContext requestContext)
+    private void InvokePipeline(in ResolveRequest request, DefaultResolveRequestContext requestContext)
     {
         request.ResolvePipeline.Invoke(requestContext);
         if (requestContext.Instance == null)

src/Autofac/Diagnostics/DiagnosticSourceExtensions.cs

@@ -60,7 +60,7 @@ public static void MiddlewareSuccess(this DiagnosticListener diagnosticSource, R
     /// <param name="diagnosticSource">The diagnostic source to which events will be written.</param>
     /// <param name="operation">The pipeline resolve operation that is about to run.</param>
     /// <param name="initiatingRequest">The request that is responsible for starting this operation.</param>
-    public static void OperationStart(this DiagnosticListener diagnosticSource, IResolveOperation operation, ResolveRequest initiatingRequest)
+    public static void OperationStart(this DiagnosticListener diagnosticSource, IResolveOperation operation, in ResolveRequest initiatingRequest)
     {
         if (diagnosticSource.IsEnabled(DiagnosticEventKeys.OperationStart))
         {

src/Autofac/Diagnostics/OperationStartDiagnosticData.cs

@@ -15,7 +15,7 @@ public class OperationStartDiagnosticData
     /// </summary>
     /// <param name="operation">The pipeline resolve operation that is about to run.</param>
     /// <param name="initiatingRequest">The request that is responsible for starting this operation.</param>
-    public OperationStartDiagnosticData(IResolveOperation operation, ResolveRequest initiatingRequest)
+    public OperationStartDiagnosticData(IResolveOperation operation, in ResolveRequest initiatingRequest)
     {
         Operation = operation;
         InitiatingRequest = initiatingRequest;

src/Autofac/Features/Decorators/DecoratorContext.cs

@@ -78,5 +78,5 @@ internal DecoratorContext UpdateContext(object decoratorInstance)
     }
 
     /// <inheritdoc />
-    public object ResolveComponent(ResolveRequest request) => _componentContext.ResolveComponent(request);
+    public object ResolveComponent(in ResolveRequest request) => _componentContext.ResolveComponent(request);
 }