Downgrade ByRefReference to an expression & rename it

stakx · stakx · commit 4fa838d49a49 · 2025-12-14T20:45:15.000+01:00
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ByRefExpression.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ByRefExpression.cs
@@ -14,35 +14,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 ByRefExpression : IExpression
 	{
-		private readonly LocalReference localReference;
-
-		public ByRefReference(LocalReference localReference)
-			: base(localReference.Type)
-		{
-			this.localReference = localReference;
-		}
-
-		public override void LoadAddressOfReference(ILGenerator gen)
-		{
-			localReference.LoadAddressOfReference(gen);
-		}
+		private readonly Reference reference;
 
-		public override void LoadReference(ILGenerator gen)
+		public ByRefExpression(Reference reference)
 		{
-			localReference.LoadAddressOfReference(gen);
+			this.reference = reference;
 		}
 
-		public override void StoreReference(IExpression expression, ILGenerator gen)
+		public void Emit(ILGenerator gen)
 		{
-			throw new NotImplementedException();
+			reference.LoadAddressOfReference(gen);
 		}
 	}
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.cs
@@ -149,7 +149,7 @@ protected virtual void ImplementInvokeMethodOnTarget(AbstractTypeEmitter invocat
 					}
 
 					invokeMethodOnTarget.CodeBuilder.AddStatement(new AssignStatement(localReference, localValue));
-					var byRefReference = new ByRefReference(localReference);
+					var byRefReference = new ByRefExpression(localReference);
 					args[i] = byRefReference;
 					byRefArguments[i] = localReference;
 				}

Original file line number	Diff line number	Diff line change
`@@ -14,35 +14,22 @@`
`14`	`14`
`15`	`15`	`namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`16`	`16`	`{`
`17`		`- using System;`
`18`	`17`	`using System.Diagnostics;`
`19`	`18`	`using System.Reflection.Emit;`
`20`	`19`
`21`		`-`
`22`		`- [DebuggerDisplay("&{localReference}")]`
`23`		`- internal class ByRefReference : Reference`
	`20`	`+ [DebuggerDisplay("&{reference}")]`
	`21`	`+ internal class ByRefExpression : IExpression`
`24`	`22`	`{`
`25`		`- private readonly LocalReference localReference;`
`26`		`-`
`27`		`- public ByRefReference(LocalReference localReference)`
`28`		`- : base(localReference.Type)`
`29`		`- {`
`30`		`- this.localReference = localReference;`
`31`		`- }`
`32`		`-`
`33`		`- public override void LoadAddressOfReference(ILGenerator gen)`
`34`		`- {`
`35`		`- localReference.LoadAddressOfReference(gen);`
`36`		`- }`
	`23`	`+ private readonly Reference reference;`
`37`	`24`
`38`		`- public override void LoadReference(ILGenerator gen)`
	`25`	`+ public ByRefExpression(Reference reference)`
`39`	`26`	`{`
`40`		`- localReference.LoadAddressOfReference(gen);`
	`27`	`+ this.reference = reference;`
`41`	`28`	`}`
`42`	`29`
`43`		`- public override void StoreReference(IExpression expression, ILGenerator gen)`
	`30`	`+ public void Emit(ILGenerator gen)`
`44`	`31`	`{`
`45`		`- throw new NotImplementedException();`
	`32`	`+ reference.LoadAddressOfReference(gen);`
`46`	`33`	`}`
`47`	`34`	`}`
`48`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ 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);`
	`152`	`+ var byRefReference = new ByRefExpression(localReference);`
`153`	`153`	`args[i] = byRefReference;`
`154`	`154`	`byRefArguments[i] = localReference;`
`155`	`155`	`}`