getTargetExpression and getTargetReference delegates can be merged

stakx · stakx · commit 16b2b3eea8a3 · 2025-12-17T00:57:28.000+01:00
diff --git a/src/Castle.Core/DynamicProxy/Contributors/Delegates.cs b/src/Castle.Core/DynamicProxy/Contributors/Delegates.cs
@@ -23,6 +23,4 @@ internal delegate MethodEmitter OverrideMethodDelegate(
 		string name, MethodAttributes attributes, MethodInfo methodToOverride);
 
 	internal delegate IExpression GetTargetExpressionDelegate(ClassEmitter @class, MethodInfo method);
-
-	internal delegate Reference GetTargetReferenceDelegate(ClassEmitter @class, MethodInfo method);
 }
diff --git a/src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithOptionalTargetContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithOptionalTargetContributor.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.
@@ -19,13 +19,9 @@ namespace Castle.DynamicProxy.Contributors
 
 	internal class InterfaceProxyWithOptionalTargetContributor : InterfaceProxyWithoutTargetContributor
 	{
-		private readonly GetTargetReferenceDelegate getTargetReference;
-
-		public InterfaceProxyWithOptionalTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget,
-		                                                   GetTargetReferenceDelegate getTargetReference)
+		public InterfaceProxyWithOptionalTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget)
 			: base(namingScope, getTarget)
 		{
-			this.getTargetReference = getTargetReference;
 			canChangeTarget = true;
 		}
 
@@ -34,7 +30,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm
 		{
 			if (!method.Proxyable)
 			{
-				return new OptionallyForwardingMethodGenerator(method, overrideMethod, getTargetReference);
+				return new OptionallyForwardingMethodGenerator(method, overrideMethod, getTarget);
 			}
 
 			return base.GetMethodGenerator(method, @class, overrideMethod);
diff --git a/src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithoutTargetContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithoutTargetContributor.cs
@@ -26,13 +26,13 @@ namespace Castle.DynamicProxy.Contributors
 
 	internal class InterfaceProxyWithoutTargetContributor : CompositeTypeContributor
 	{
-		private readonly GetTargetExpressionDelegate getTargetExpression;
+		protected readonly GetTargetExpressionDelegate getTarget;
 		protected bool canChangeTarget = false;
 
 		public InterfaceProxyWithoutTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget)
 			: base(namingScope)
 		{
-			getTargetExpression = getTarget;
+			this.getTarget = getTarget;
 		}
 
 		protected override IEnumerable<MembersCollector> GetCollectors()
@@ -56,7 +56,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm
 			return new MethodWithInvocationGenerator(method,
 			                                         @class.GetField("__interceptors"),
 			                                         invocation,
-			                                         getTargetExpression,
+			                                         getTarget,
 			                                         overrideMethod,
 			                                         null);
 		}
diff --git a/src/Castle.Core/DynamicProxy/Generators/ForwardingMethodGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/ForwardingMethodGenerator.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.
@@ -20,24 +20,24 @@ namespace Castle.DynamicProxy.Generators
 
 	internal class ForwardingMethodGenerator : MethodGenerator
 	{
-		private readonly GetTargetReferenceDelegate getTargetReference;
+		private readonly GetTargetExpressionDelegate getTarget;
 
 		public ForwardingMethodGenerator(MetaMethod method, OverrideMethodDelegate overrideMethod,
-		                                 GetTargetReferenceDelegate getTargetReference)
+		                                 GetTargetExpressionDelegate getTarget)
 			: base(method, overrideMethod)
 		{
-			this.getTargetReference = getTargetReference;
+			this.getTarget = getTarget;
 		}
 
 		protected override MethodEmitter BuildProxiedMethodBody(MethodEmitter emitter, ClassEmitter @class,
 		                                                        INamingScope namingScope)
 		{
-			var targetReference = getTargetReference(@class, MethodToOverride);
+			var target = getTarget(@class, MethodToOverride);
 			var arguments = ArgumentsUtil.ConvertToArgumentReferenceExpression(MethodToOverride.GetParameters());
 
 			emitter.CodeBuilder.AddStatement(new ReturnStatement(
 			                                 	new MethodInvocationExpression(
-			                                 		targetReference,
+			                                 		target,
 			                                 		MethodToOverride,
 			                                 		arguments) { VirtualCall = true }));
 			return emitter;
diff --git a/src/Castle.Core/DynamicProxy/Generators/InterfaceProxyWithTargetInterfaceGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/InterfaceProxyWithTargetInterfaceGenerator.cs
@@ -57,18 +57,13 @@ protected override void AddMappingForAdditionalInterfaces(CompositeTypeContribut
 		protected override InterfaceProxyWithoutTargetContributor GetContributorForAdditionalInterfaces(
 			INamingScope namingScope)
 		{
-			return new InterfaceProxyWithOptionalTargetContributor(namingScope, GetTargetExpression, GetTarget)
+			return new InterfaceProxyWithOptionalTargetContributor(namingScope, GetTarget)
 			{ Logger = Logger };
 		}
 
-		private Reference GetTarget(ClassEmitter @class, MethodInfo method)
+		private IExpression GetTarget(ClassEmitter @class, MethodInfo method)
 		{
 			return new AsTypeReference(@class.GetField("__target"), method.DeclaringType);
 		}
-
-		private IExpression GetTargetExpression(ClassEmitter @class, MethodInfo method)
-		{
-			return GetTarget(@class, method);
-		}
 	}
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/OptionallyForwardingMethodGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/OptionallyForwardingMethodGenerator.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.
@@ -24,37 +24,37 @@ namespace Castle.DynamicProxy.Generators
 	internal class OptionallyForwardingMethodGenerator : MethodGenerator
 	{
 		// TODO: This class largely duplicates code from Forwarding and Minimalistic generators. Should be refactored to change that
-		private readonly GetTargetReferenceDelegate getTargetReference;
+		private readonly GetTargetExpressionDelegate getTarget;
 
 		public OptionallyForwardingMethodGenerator(MetaMethod method, OverrideMethodDelegate overrideMethod,
-		                                           GetTargetReferenceDelegate getTargetReference)
+		                                           GetTargetExpressionDelegate getTarget)
 			: base(method, overrideMethod)
 		{
-			this.getTargetReference = getTargetReference;
+			this.getTarget = getTarget;
 		}
 
 		protected override MethodEmitter BuildProxiedMethodBody(MethodEmitter emitter, ClassEmitter @class,
 		                                                        INamingScope namingScope)
 		{
-			var targetReference = getTargetReference(@class, MethodToOverride);
+			var target = getTarget(@class, MethodToOverride);
 
 			emitter.CodeBuilder.AddStatement(
 				new IfNullExpression(
-					targetReference,
+					target,
 					IfNull(emitter.ReturnType),
-					IfNotNull(targetReference)));
+					IfNotNull(target)));
 
 			return emitter;
 		}
 
-		private IStatement IfNotNull(Reference targetReference)
+		private IStatement IfNotNull(IExpression target)
 		{
 			var statements = new BlockStatement();
 			var arguments = ArgumentsUtil.ConvertToArgumentReferenceExpression(MethodToOverride.GetParameters());
 
 			statements.AddStatement(new ReturnStatement(
 			                        	new MethodInvocationExpression(
-			                        		targetReference,
+			                        		target,
 			                        		MethodToOverride,
 			                        		arguments) { VirtualCall = true }));
 			return statements;

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,4 @@ internal delegate MethodEmitter OverrideMethodDelegate(`
`23`	`23`	`string name, MethodAttributes attributes, MethodInfo methodToOverride);`
`24`	`24`
`25`	`25`	`internal delegate IExpression GetTargetExpressionDelegate(ClassEmitter @class, MethodInfo method);`
`26`		`-`
`27`		`- internal delegate Reference GetTargetReferenceDelegate(ClassEmitter @class, MethodInfo method);`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2004-2021 Castle Project - http://www.castleproject.org/`
	`1`	`+// Copyright 2004-2025 Castle Project - http://www.castleproject.org/`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`
`@@ -19,13 +19,9 @@ namespace Castle.DynamicProxy.Contributors`
`19`	`19`
`20`	`20`	`internal class InterfaceProxyWithOptionalTargetContributor : InterfaceProxyWithoutTargetContributor`
`21`	`21`	`{`
`22`		`- private readonly GetTargetReferenceDelegate getTargetReference;`
`23`		`-`
`24`		`- public InterfaceProxyWithOptionalTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget,`
`25`		`- GetTargetReferenceDelegate getTargetReference)`
	`22`	`+ public InterfaceProxyWithOptionalTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget)`
`26`	`23`	`: base(namingScope, getTarget)`
`27`	`24`	`{`
`28`		`- this.getTargetReference = getTargetReference;`
`29`	`25`	`canChangeTarget = true;`
`30`	`26`	`}`
`31`	`27`
`@@ -34,7 +30,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm`
`34`	`30`	`{`
`35`	`31`	`if (!method.Proxyable)`
`36`	`32`	`{`
`37`		`- return new OptionallyForwardingMethodGenerator(method, overrideMethod, getTargetReference);`
	`33`	`+ return new OptionallyForwardingMethodGenerator(method, overrideMethod, getTarget);`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`return base.GetMethodGenerator(method, @class, overrideMethod);`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ namespace Castle.DynamicProxy.Contributors`
`26`	`26`
`27`	`27`	`internal class InterfaceProxyWithoutTargetContributor : CompositeTypeContributor`
`28`	`28`	`{`
`29`		`- private readonly GetTargetExpressionDelegate getTargetExpression;`
	`29`	`+ protected readonly GetTargetExpressionDelegate getTarget;`
`30`	`30`	`protected bool canChangeTarget = false;`
`31`	`31`
`32`	`32`	`public InterfaceProxyWithoutTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget)`
`33`	`33`	`: base(namingScope)`
`34`	`34`	`{`
`35`		`- getTargetExpression = getTarget;`
	`35`	`+ this.getTarget = getTarget;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`protected override IEnumerable<MembersCollector> GetCollectors()`
`@@ -56,7 +56,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm`
`56`	`56`	`return new MethodWithInvocationGenerator(method,`
`57`	`57`	`@class.GetField("__interceptors"),`
`58`	`58`	`invocation,`
`59`		`- getTargetExpression,`
	`59`	`+ getTarget,`
`60`	`60`	`overrideMethod,`
`61`	`61`	`null);`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,18 +57,13 @@ protected override void AddMappingForAdditionalInterfaces(CompositeTypeContribut`
`57`	`57`	`protected override InterfaceProxyWithoutTargetContributor GetContributorForAdditionalInterfaces(`
`58`	`58`	`INamingScope namingScope)`
`59`	`59`	`{`
`60`		`- return new InterfaceProxyWithOptionalTargetContributor(namingScope, GetTargetExpression, GetTarget)`
	`60`	`+ return new InterfaceProxyWithOptionalTargetContributor(namingScope, GetTarget)`
`61`	`61`	`{ Logger = Logger };`
`62`	`62`	`}`
`63`	`63`
`64`		`- private Reference GetTarget(ClassEmitter @class, MethodInfo method)`
	`64`	`+ private IExpression GetTarget(ClassEmitter @class, MethodInfo method)`
`65`	`65`	`{`
`66`	`66`	`return new AsTypeReference(@class.GetField("__target"), method.DeclaringType);`
`67`	`67`	`}`
`68`		`-`
`69`		`- private IExpression GetTargetExpression(ClassEmitter @class, MethodInfo method)`
`70`		`- {`
`71`		`- return GetTarget(@class, method);`
`72`		`- }`
`73`	`68`	`}`
`74`	`69`	`}`