Downgrade ByRefReference to an expression & rename it

stakx · stakx · commit 81f1b9bd159d · 2025-12-17T00:59:01.000+01:00
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AddressOfExpression.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AddressOfExpression.cs
@@ -16,35 +16,22 @@
 
 namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 {
-	using System;
 	using System.Diagnostics;
 	using System.Reflection.Emit;
 
-
-	[DebuggerDisplay("&{localReference}")]
-	internal class ByRefReference : Reference
+	[DebuggerDisplay("&{reference}")]
+	internal class AddressOfExpression : IExpression
 	{
-		private readonly LocalReference localReference;
-
-		public ByRefReference(LocalReference localReference)
-			: base(localReference.Type)
-		{
-			this.localReference = localReference;
-		}
-
-		public override void EmitAddress(ILGenerator gen)
-		{
-			localReference.EmitAddress(gen);
-		}
+		private readonly Reference reference;
 
-		public override void Emit(ILGenerator gen)
+		public AddressOfExpression(Reference reference)
 		{
-			localReference.EmitAddress(gen);
+			this.reference = reference;
 		}
 
-		public override void EmitStore(IExpression value, ILGenerator gen)
+		public void Emit(ILGenerator gen)
 		{
-			throw new NotImplementedException();
+			reference.EmitAddress(gen);
 		}
 	}
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.cs
@@ -149,8 +149,8 @@ protected virtual void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invocat
 					}
 
 					invokeMethodOnTarget.CodeBuilder.AddStatement(new AssignStatement(localReference, localValue));
-					var byRefReference = new ByRefReference(localReference);
-					args[i] = byRefReference;
+					var localByRef = new AddressOfExpression(localReference);
+					args[i] = localByRef;
 					byRefArguments[i] = localReference;
 				}
 				else

Original file line number	Diff line number	Diff line change
`@@ -16,35 +16,22 @@`
`16`	`16`
`17`	`17`	`namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`18`	`18`	`{`
`19`		`- using System;`
`20`	`19`	`using System.Diagnostics;`
`21`	`20`	`using System.Reflection.Emit;`
`22`	`21`
`23`		`-`
`24`		`- [DebuggerDisplay("&{localReference}")]`
`25`		`- internal class ByRefReference : Reference`
	`22`	`+ [DebuggerDisplay("&{reference}")]`
	`23`	`+ internal class AddressOfExpression : IExpression`
`26`	`24`	`{`
`27`		`- private readonly LocalReference localReference;`
`28`		`-`
`29`		`- public ByRefReference(LocalReference localReference)`
`30`		`- : base(localReference.Type)`
`31`		`- {`
`32`		`- this.localReference = localReference;`
`33`		`- }`
`34`		`-`
`35`		`- public override void EmitAddress(ILGenerator gen)`
`36`		`- {`
`37`		`- localReference.EmitAddress(gen);`
`38`		`- }`
	`25`	`+ private readonly Reference reference;`
`39`	`26`
`40`		`- public override void Emit(ILGenerator gen)`
	`27`	`+ public AddressOfExpression(Reference reference)`
`41`	`28`	`{`
`42`		`- localReference.EmitAddress(gen);`
	`29`	`+ this.reference = reference;`
`43`	`30`	`}`
`44`	`31`
`45`		`- public override void EmitStore(IExpression value, ILGenerator gen)`
	`32`	`+ public void Emit(ILGenerator gen)`
`46`	`33`	`{`
`47`		`- throw new NotImplementedException();`
	`34`	`+ reference.EmitAddress(gen);`
`48`	`35`	`}`
`49`	`36`	`}`
`50`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,8 @@ protected virtual void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invocat`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`invokeMethodOnTarget.CodeBuilder.AddStatement(new AssignStatement(localReference, localValue));`
`152`		`- var byRefReference = new ByRefReference(localReference);`
`153`		`- args[i] = byRefReference;`
	`152`	`+ var localByRef = new AddressOfExpression(localReference);`
	`153`	`+ args[i] = localByRef;`
`154`	`154`	`byRefArguments[i] = localReference;`
`155`	`155`	`}`
`156`	`156`	`else`