Remove sequential coupling in LocalReference

Author: stakx

src/Castle.Core/DynamicProxy/Generators/Emitters/CodeBuilder.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.
@@ -22,14 +22,12 @@ namespace Castle.DynamicProxy.Generators.Emitters
 
 	internal sealed class CodeBuilder
 	{
-		private readonly List<LocalReference> locals;
 		private readonly List<IStatement> statements;
 		private bool isEmpty;
 
 		public CodeBuilder()
 		{
 			statements = new List<IStatement>();
-			locals = new List<LocalReference>();
 			isEmpty = true;
 		}
 
@@ -47,18 +45,11 @@ public CodeBuilder AddStatement(IStatement statement)
 
 		public LocalReference DeclareLocal(Type type)
 		{
-			var local = new LocalReference(type);
-			locals.Add(local);
-			return local;
+			return new LocalReference(type);
 		}
 
 		internal void Generate(ILGenerator il)
 		{
-			foreach (var local in locals)
-			{
-				local.Generate(il);
-			}
-
 			foreach (var statement in statements)
 			{
 				statement.Emit(il);

src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/LocalReference.cs

@@ -23,32 +23,32 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 	[DebuggerDisplay("local {Type}")]
 	internal class LocalReference : Reference
 	{
-		private LocalBuilder? localBuilder;
+		private LocalBuilder? local;
 
 		public LocalReference(Type type)
 			: base(type)
 		{
 		}
 
-		public override void Generate(ILGenerator gen)
-		{
-			localBuilder = gen.DeclareLocal(base.Type);
-		}
-
 		public override void EmitAddress(ILGenerator gen)
 		{
-			gen.Emit(OpCodes.Ldloca, localBuilder!);
+			gen.Emit(OpCodes.Ldloca, GetInitializedLocal(gen));
 		}
 
 		public override void Emit(ILGenerator gen)
 		{
-			gen.Emit(OpCodes.Ldloc, localBuilder!);
+			gen.Emit(OpCodes.Ldloc, GetInitializedLocal(gen));
 		}
 
 		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			value.Emit(gen);
-			gen.Emit(OpCodes.Stloc, localBuilder!);
+			gen.Emit(OpCodes.Stloc, GetInitializedLocal(gen));
+		}
+
+		private LocalBuilder GetInitializedLocal(ILGenerator gen)
+		{
+			return local ??= gen.DeclareLocal(Type);
 		}
 	}
 }

src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/Reference.cs

@@ -38,9 +38,5 @@ public Type Type
 		public abstract void Emit(ILGenerator gen);
 
 		public abstract void EmitStore(IExpression value, ILGenerator gen);
-
-		public virtual void Generate(ILGenerator gen)
-		{
-		}
 	}
 }