ProxyTargetAccessorContributor.getTarget does not need a reference

Author: stakx

src/Castle.Core/DynamicProxy/Contributors/ProxyTargetAccessorContributor.cs

@@ -1,4 +1,4 @@
-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@ namespace Castle.DynamicProxy.Contributors
 	/// </summary>
 	internal sealed class ProxyTargetAccessorContributor : ITypeContributor
 	{
-		private readonly Func<Reference> getTargetReference;
+		private readonly Func<IExpression> getTarget;
 		private readonly Type targetType;
 
-		public ProxyTargetAccessorContributor(Func<Reference> getTargetReference, Type targetType)
+		public ProxyTargetAccessorContributor(Func<IExpression> getTarget, Type targetType)
 		{
-			this.getTargetReference = getTargetReference;
+			this.getTarget = getTarget;
 			this.targetType = targetType;
 		}
 
@@ -41,17 +41,17 @@ public void CollectElementsToProxy(IProxyGenerationHook hook, MetaType model)
 		public void Generate(ClassEmitter emitter)
 		{
 			var interceptorsField = emitter.GetField("__interceptors");
-			var targetReference = getTargetReference();
+			var target = getTarget();
 
 			var dynProxyGetTarget = emitter.CreateMethod(nameof(IProxyTargetAccessor.DynProxyGetTarget), typeof(object));
 
 			dynProxyGetTarget.CodeBuilder.AddStatement(
-				new ReturnStatement(new ConvertExpression(typeof(object), targetType, targetReference)));
+				new ReturnStatement(new ConvertExpression(typeof(object), targetType, target)));
 
 			var dynProxySetTarget = emitter.CreateMethod(nameof(IProxyTargetAccessor.DynProxySetTarget), typeof(void), typeof(object));
 
 			// we can only change the target of the interface proxy
-			if (targetReference is FieldReference targetField)
+			if (target is FieldReference targetField)
 			{
 				dynProxySetTarget.CodeBuilder.AddStatement(
 					new AssignStatement(targetField,

src/Castle.Core/DynamicProxy/Generators/ClassProxyGenerator.cs

@@ -1,4 +1,4 @@
-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(INamingSco
 		protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()
 		{
 			return new ProxyTargetAccessorContributor(
-				getTargetReference: () => SelfReference.Self,
+				getTarget: () => SelfReference.Self,
 				targetType);
 		}
 	}

src/Castle.Core/DynamicProxy/Generators/ClassProxyWithTargetGenerator.cs

@@ -1,4 +1,4 @@
-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(INamingSco
 		protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()
 		{
 			return new ProxyTargetAccessorContributor(
-				getTargetReference: () => targetField,
+				getTarget: () => targetField,
 				targetType);
 		}
 

src/Castle.Core/DynamicProxy/Generators/InterfaceProxyWithTargetGenerator.cs

@@ -1,4 +1,4 @@
-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(Type proxy
 		protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()
 		{
 			return new ProxyTargetAccessorContributor(
-				getTargetReference: () => targetField,
+				getTarget: () => targetField,
 				proxyTargetType);
 		}
 

src/Castle.Core/DynamicProxy/Generators/InterfaceProxyWithTargetInterfaceGenerator.cs

@@ -1,4 +1,4 @@
-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(Type proxy
 		protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()
 		{
 			return new ProxyTargetAccessorContributor(
-				getTargetReference: () => targetField,
+				getTarget: () => targetField,
 				proxyTargetType);
 		}
 

src/Castle.Core/DynamicProxy/Generators/InterfaceProxyWithoutTargetGenerator.cs

@@ -1,4 +1,4 @@
-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(Type proxy
 		protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()
 		{
 			return new ProxyTargetAccessorContributor(
-				getTargetReference: () => targetField,
+				getTarget: () => targetField,
 				proxyTargetType);
 		}