Downgrade SelfReference to an expression & rename it

stakx · stakx · commit d2d2d96f3726 · 2025-12-16T23:29:57.000+01:00
diff --git a/src/Castle.Core/DynamicProxy/Contributors/ClassProxySerializableContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/ClassProxySerializableContributor.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.
@@ -129,7 +129,7 @@ private void EmitCustomGetObjectData(CodeBuilder codeBuilder, ArgumentReference
 			var getObjectData = new MethodInvocationExpression(
 				null,
 				FormatterServicesMethods.GetObjectData,
-				SelfReference.Self,
+				ThisExpression.Instance,
 				members);
 			codeBuilder.AddStatement(new AssignStatement(data, getObjectData));
 
diff --git a/src/Castle.Core/DynamicProxy/Contributors/ClassProxyTargetContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/ClassProxyTargetContributor.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.
@@ -122,7 +122,7 @@ private MethodBuilder CreateCallbackMethod(ClassEmitter emitter, MethodInfo meth
 
 			callBackMethod.CodeBuilder.AddStatement(
 				new ReturnStatement(
-					new MethodInvocationExpression(SelfReference.Self,
+					new MethodInvocationExpression(ThisExpression.Instance,
 					                               targetMethod,
 					                               callBackMethod.Arguments)));
 
diff --git a/src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithoutTargetContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithoutTargetContributor.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.
@@ -119,7 +119,7 @@ private MethodInfo CreateCallbackMethod(ClassEmitter emitter, MethodInfo methodI
 
 			callBackMethod.CodeBuilder.AddStatement(
 				new ReturnStatement(
-					new MethodInvocationExpression(SelfReference.Self, targetMethod, callBackMethod.Arguments)));
+					new MethodInvocationExpression(ThisExpression.Instance, targetMethod, callBackMethod.Arguments)));
 
 			return callBackMethod.MethodBuilder;
 		}
diff --git a/src/Castle.Core/DynamicProxy/Generators/ClassProxyGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/ClassProxyGenerator.cs
@@ -51,7 +51,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(INamingSco
 		protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()
 		{
 			return new ProxyTargetAccessorContributor(
-				getTarget: () => SelfReference.Self,
+				getTarget: () => ThisExpression.Instance,
 				targetType);
 		}
 	}
diff --git a/src/Castle.Core/DynamicProxy/Generators/CompositionInvocationTypeGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/CompositionInvocationTypeGenerator.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.
@@ -62,7 +62,7 @@ protected override void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invoca
 		{
 			invokeMethodOnTarget.CodeBuilder.AddStatement(
 				new MethodInvocationExpression(
-					SelfReference.Self,
+					ThisExpression.Instance,
 					InvocationMethods.CompositionInvocationEnsureValidTarget));
 
 			base.ImplementInvokeMethodOnTarget(invocation, parameters, invokeMethodOnTarget, targetField);
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/FieldReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/FieldReference.cs
@@ -64,7 +64,7 @@ public override void EmitAddress(ILGenerator gen)
 			}
 			else
 			{
-				SelfReference.Self.Emit(gen);
+				ThisExpression.Instance.Emit(gen);
 				gen.Emit(OpCodes.Ldflda, Reference);
 			}
 		}
@@ -77,7 +77,7 @@ public override void Emit(ILGenerator gen)
 			}
 			else
 			{
-				SelfReference.Self.Emit(gen);
+				ThisExpression.Instance.Emit(gen);
 				gen.Emit(OpCodes.Ldfld, Reference);
 			}
 		}
@@ -91,7 +91,7 @@ public override void EmitStore(IExpression value, ILGenerator gen)
 			}
 			else
 			{
-				SelfReference.Self.Emit(gen);
+				ThisExpression.Instance.Emit(gen);
 				value.Emit(gen);
 				gen.Emit(OpCodes.Stfld, Reference);
 			}
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/MethodInvocationExpression.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/MethodInvocationExpression.cs
@@ -26,12 +26,12 @@ internal class MethodInvocationExpression : IExpression, IStatement
 		protected readonly IExpression? instance;
 
 		public MethodInvocationExpression(MethodInfo method, params IExpression[] args) :
-			this(SelfReference.Self, method, args)
+			this(ThisExpression.Instance, method, args)
 		{
 		}
 
 		public MethodInvocationExpression(MethodEmitter method, params IExpression[] args) :
-			this(SelfReference.Self, method.MethodBuilder, args)
+			this(ThisExpression.Instance, method.MethodBuilder, args)
 		{
 		}
 
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ThisExpression.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ThisExpression.cs
@@ -21,28 +21,17 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 	using System.Reflection.Emit;
 
 	[DebuggerDisplay("this")]
-	internal class SelfReference : Reference
+	internal class ThisExpression : IExpression
 	{
-		public static readonly SelfReference Self = new SelfReference();
+		public static readonly ThisExpression Instance = new ThisExpression();
 
-		protected SelfReference()
+		protected ThisExpression()
 		{
 		}
 
-		public override void EmitAddress(ILGenerator gen)
-		{
-			throw new NotSupportedException();
-		}
-
-		public override void Emit(ILGenerator gen)
+		public void Emit(ILGenerator gen)
 		{
 			gen.Emit(OpCodes.Ldarg_0);
 		}
-
-		public override void EmitStore(IExpression value, ILGenerator gen)
-		{
-			// It does not make sense to assign a value to the this pointer.
-			throw new NotSupportedException();
-		}
 	}
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.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.
@@ -143,7 +143,7 @@ protected virtual void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invocat
 #endif
 					{
 						localValue = new ConvertExpression(paramType.GetElementType(),
-						                               new MethodInvocationExpression(SelfReference.Self,
+						                               new MethodInvocationExpression(ThisExpression.Instance,
 						                                                              InvocationMethods.GetArgumentValue,
 						                                                              new LiteralIntExpression(i)));
 					}
@@ -170,7 +170,7 @@ protected virtual void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invocat
 					{
 						args[i] =
 							new ConvertExpression(paramType,
-							                      new MethodInvocationExpression(SelfReference.Self,
+							                      new MethodInvocationExpression(ThisExpression.Instance,
 							                                                     InvocationMethods.GetArgumentValue,
 							                                                     new LiteralIntExpression(i)));
 					}
@@ -218,7 +218,7 @@ protected virtual void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invocat
 				}
 
 				var setRetVal =
-					new MethodInvocationExpression(SelfReference.Self,
+					new MethodInvocationExpression(ThisExpression.Instance,
 					                               InvocationMethods.SetReturnValue,
 					                               retVal);
 
@@ -260,7 +260,7 @@ private void AssignBackByRefArguments(MethodEmitter invokeMethodOnTarget, Dictio
 
 				invokeMethodOnTarget.CodeBuilder.AddStatement(
 					new MethodInvocationExpression(
-						SelfReference.Self,
+						ThisExpression.Instance,
 						InvocationMethods.SetArgumentValue,
 						new LiteralIntExpression(index),
 						localValue));
diff --git a/src/Castle.Core/DynamicProxy/Generators/MethodWithInvocationGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/MethodWithInvocationGenerator.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.
@@ -235,7 +235,7 @@ private IExpression[] GetCtorArguments(ClassEmitter @class, IExpression proxiedM
 			return new[]
 			{
 				getTargetExpression(@class, MethodToOverride),
-				SelfReference.Self,
+				ThisExpression.Instance,
 				methodInterceptors ?? interceptors,
 				proxiedMethodTokenExpression,
 				new ReferencesToObjectArrayExpression(dereferencedArguments)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected override CompositeTypeContributor GetProxyTargetContributor(INamingSco`
`51`	`51`	`protected override ProxyTargetAccessorContributor GetProxyTargetAccessorContributor()`
`52`	`52`	`{`
`53`	`53`	`return new ProxyTargetAccessorContributor(`
`54`		`- getTarget: () => SelfReference.Self,`
	`54`	`+ getTarget: () => ThisExpression.Instance,`
`55`	`55`	`targetType);`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public override void EmitAddress(ILGenerator gen)`
`64`	`64`	`}`
`65`	`65`	`else`
`66`	`66`	`{`
`67`		`- SelfReference.Self.Emit(gen);`
	`67`	`+ ThisExpression.Instance.Emit(gen);`
`68`	`68`	`gen.Emit(OpCodes.Ldflda, Reference);`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -77,7 +77,7 @@ public override void Emit(ILGenerator gen)`
`77`	`77`	`}`
`78`	`78`	`else`
`79`	`79`	`{`
`80`		`- SelfReference.Self.Emit(gen);`
	`80`	`+ ThisExpression.Instance.Emit(gen);`
`81`	`81`	`gen.Emit(OpCodes.Ldfld, Reference);`
`82`	`82`	`}`
`83`	`83`	`}`
`@@ -91,7 +91,7 @@ public override void EmitStore(IExpression value, ILGenerator gen)`
`91`	`91`	`}`
`92`	`92`	`else`
`93`	`93`	`{`
`94`		`- SelfReference.Self.Emit(gen);`
	`94`	`+ ThisExpression.Instance.Emit(gen);`
`95`	`95`	`value.Emit(gen);`
`96`	`96`	`gen.Emit(OpCodes.Stfld, Reference);`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ internal class MethodInvocationExpression : IExpression, IStatement`
`26`	`26`	`protected readonly IExpression? instance;`
`27`	`27`
`28`	`28`	`public MethodInvocationExpression(MethodInfo method, params IExpression[] args) :`
`29`		`- this(SelfReference.Self, method, args)`
	`29`	`+ this(ThisExpression.Instance, method, args)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public MethodInvocationExpression(MethodEmitter method, params IExpression[] args) :`
`34`		`- this(SelfReference.Self, method.MethodBuilder, args)`
	`34`	`+ this(ThisExpression.Instance, method.MethodBuilder, args)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -21,28 +21,17 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`21`	`21`	`using System.Reflection.Emit;`
`22`	`22`
`23`	`23`	`[DebuggerDisplay("this")]`
`24`		`- internal class SelfReference : Reference`
	`24`	`+ internal class ThisExpression : IExpression`
`25`	`25`	`{`
`26`		`- public static readonly SelfReference Self = new SelfReference();`
	`26`	`+ public static readonly ThisExpression Instance = new ThisExpression();`
`27`	`27`
`28`		`- protected SelfReference()`
	`28`	`+ protected ThisExpression()`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`32`		`- public override void EmitAddress(ILGenerator gen)`
`33`		`- {`
`34`		`- throw new NotSupportedException();`
`35`		`- }`
`36`		`-`
`37`		`- public override void Emit(ILGenerator gen)`
	`32`	`+ public void Emit(ILGenerator gen)`
`38`	`33`	`{`
`39`	`34`	`gen.Emit(OpCodes.Ldarg_0);`
`40`	`35`	`}`
`41`		`-`
`42`		`- public override void EmitStore(IExpression value, ILGenerator gen)`
`43`		`- {`
`44`		`- // It does not make sense to assign a value to the this pointer.`
`45`		`- throw new NotSupportedException();`
`46`		`- }`
`47`	`36`	`}`
`48`	`37`	`}`