Merge TypeReference into Reference

stakx · stakx · commit 895f61282ed1 · 2025-12-16T23:36:58.000+01:00
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ArgumentReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ArgumentReference.cs
@@ -21,7 +21,7 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 	using System.Reflection.Emit;
 
 	[DebuggerDisplay("argument {Type}")]
-	internal class ArgumentReference : TypeReference
+	internal class ArgumentReference : Reference
 	{
 		public ArgumentReference(Type argumentType)
 			: base(argumentType)
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AsTypeReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AsTypeReference.cs
@@ -27,6 +27,7 @@ internal class AsTypeReference : Reference
 		private readonly Type type;
 
 		public AsTypeReference(Reference reference, Type type)
+			: base(type)
 		{
 			this.reference = reference;
 			this.type = type;
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ByRefReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ByRefReference.cs
@@ -22,7 +22,7 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 
 
 	[DebuggerDisplay("&{localReference}")]
-	internal class ByRefReference : TypeReference
+	internal class ByRefReference : Reference
 	{
 		private readonly LocalReference localReference;
 
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/FieldReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/FieldReference.cs
@@ -28,6 +28,7 @@ internal class FieldReference : Reference
 		private readonly bool isStatic;
 
 		public FieldReference(FieldInfo field)
+			: base(field.FieldType)
 		{
 			this.field = field;
 			if ((field.Attributes & FieldAttributes.Static) != 0)
@@ -37,6 +38,7 @@ public FieldReference(FieldInfo field)
 		}
 
 		public FieldReference(FieldBuilder fieldBuilder)
+			: base(fieldBuilder.FieldType)
 		{
 			this.fieldBuilder = fieldBuilder;
 			field = fieldBuilder;
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/IndirectReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/IndirectReference.cs
@@ -26,12 +26,12 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 	///   ByRef and provides indirect load/store support.
 	/// </summary>
 	[DebuggerDisplay("&{OwnerReference}")]
-	internal class IndirectReference : TypeReference
+	internal class IndirectReference : Reference
 	{
-		private readonly TypeReference byRefReference;
+		private readonly Reference byRefReference;
 
-		public IndirectReference(TypeReference byRefReference)
-			: base(byRefReference.Type.GetElementType())
+		public IndirectReference(Reference byRefReference)
+			: base(byRefReference.Type.GetElementType()!)
 		{
 			if (!byRefReference.Type.IsByRef)
 			{
@@ -59,15 +59,15 @@ public override void EmitStore(IExpression value, ILGenerator gen)
 			OpCodeUtil.EmitStoreIndirectOpCodeForType(gen, Type);
 		}
 
-		public static TypeReference WrapIfByRef(TypeReference reference)
+		public static Reference WrapIfByRef(Reference reference)
 		{
 			return reference.Type.IsByRef ? new IndirectReference(reference) : reference;
 		}
 
 		// TODO: Better name
-		public static TypeReference[] WrapIfByRef(TypeReference[] references)
+		public static Reference[] WrapIfByRef(Reference[] references)
 		{
-			var result = new TypeReference[references.Length];
+			var result = new Reference[references.Length];
 
 			for (var i = 0; i < references.Length; i++)
 			{
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/LocalReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/LocalReference.cs
@@ -21,7 +21,7 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 	using System.Reflection.Emit;
 
 	[DebuggerDisplay("local {Type}")]
-	internal class LocalReference : TypeReference
+	internal class LocalReference : Reference
 	{
 		private LocalBuilder? localBuilder;
 
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/Reference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/Reference.cs
@@ -16,10 +16,23 @@
 
 namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 {
+	using System;
 	using System.Reflection.Emit;
 
 	internal abstract class Reference : IExpression
 	{
+		private readonly Type type;
+
+		protected Reference(Type type)
+		{
+			this.type = type;
+		}
+
+		public Type Type
+		{
+			get { return type; }
+		}
+
 		public abstract void EmitAddress(ILGenerator gen);
 
 		public abstract void Emit(ILGenerator gen);
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ReferencesToObjectArrayExpression.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ReferencesToObjectArrayExpression.cs
@@ -24,9 +24,9 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 
 	internal class ReferencesToObjectArrayExpression : IExpression
 	{
-		private readonly TypeReference[] args;
+		private readonly Reference[] args;
 
-		public ReferencesToObjectArrayExpression(params TypeReference[] args)
+		public ReferencesToObjectArrayExpression(params Reference[] args)
 		{
 			this.args = args;
 		}
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/TypeReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/TypeReference.cs
diff --git a/src/Castle.Core/DynamicProxy/Generators/GeneratorUtil.cs b/src/Castle.Core/DynamicProxy/Generators/GeneratorUtil.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.
@@ -25,7 +25,7 @@ namespace Castle.DynamicProxy.Generators
 
 	internal static class GeneratorUtil
 	{
-		public static void CopyOutAndRefParameters(TypeReference[] dereferencedArguments, LocalReference invocation,
+		public static void CopyOutAndRefParameters(Reference[] dereferencedArguments, LocalReference invocation,
 		                                           MethodInfo method, MethodEmitter emitter)
 		{
 			var parameters = method.GetParameters();
@@ -131,12 +131,12 @@ bool IsReadOnly(ParameterInfo parameter)
 			}
 		}
 
-		private static ConvertExpression Argument(int i, LocalReference invocationArgs, TypeReference[] arguments)
+		private static ConvertExpression Argument(int i, LocalReference invocationArgs, Reference[] arguments)
 		{
 			return new ConvertExpression(arguments[i].Type, new LoadRefArrayElementExpression(i, invocationArgs));
 		}
 
-		private static AssignStatement AssignArgument(TypeReference[] dereferencedArguments, int i,
+		private static AssignStatement AssignArgument(Reference[] dereferencedArguments, int i,
 		                                              LocalReference invocationArgs)
 		{
 			return new AssignStatement(dereferencedArguments[i], Argument(i, invocationArgs, dereferencedArguments));
diff --git a/src/Castle.Core/DynamicProxy/Generators/MethodWithInvocationGenerator.cs b/src/Castle.Core/DynamicProxy/Generators/MethodWithInvocationGenerator.cs
@@ -230,7 +230,7 @@ private void EmitLoadGenericMethodArguments(MethodEmitter methodEmitter, MethodI
 				                               genericParamsArrayLocal));
 		}
 
-		private IExpression[] GetCtorArguments(ClassEmitter @class, IExpression proxiedMethodTokenExpression, TypeReference[] dereferencedArguments, IExpression methodInterceptors)
+		private IExpression[] GetCtorArguments(ClassEmitter @class, IExpression proxiedMethodTokenExpression, Reference[] dereferencedArguments, IExpression methodInterceptors)
 		{
 			return new[]
 			{

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`21`	`21`	`using System.Reflection.Emit;`
`22`	`22`
`23`	`23`	`[DebuggerDisplay("argument {Type}")]`
`24`		`- internal class ArgumentReference : TypeReference`
	`24`	`+ internal class ArgumentReference : Reference`
`25`	`25`	`{`
`26`	`26`	`public ArgumentReference(Type argumentType)`
`27`	`27`	`: base(argumentType)`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ internal class AsTypeReference : Reference`
`27`	`27`	`private readonly Type type;`
`28`	`28`
`29`	`29`	`public AsTypeReference(Reference reference, Type type)`
	`30`	`+ : base(type)`
`30`	`31`	`{`
`31`	`32`	`this.reference = reference;`
`32`	`33`	`this.type = type;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`22`	`22`
`23`	`23`
`24`	`24`	`[DebuggerDisplay("&{localReference}")]`
`25`		`- internal class ByRefReference : TypeReference`
	`25`	`+ internal class ByRefReference : Reference`
`26`	`26`	`{`
`27`	`27`	`private readonly LocalReference localReference;`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ internal class FieldReference : Reference`
`28`	`28`	`private readonly bool isStatic;`
`29`	`29`
`30`	`30`	`public FieldReference(FieldInfo field)`
	`31`	`+ : base(field.FieldType)`
`31`	`32`	`{`
`32`	`33`	`this.field = field;`
`33`	`34`	`if ((field.Attributes & FieldAttributes.Static) != 0)`
`@@ -37,6 +38,7 @@ public FieldReference(FieldInfo field)`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`public FieldReference(FieldBuilder fieldBuilder)`
	`41`	`+ : base(fieldBuilder.FieldType)`
`40`	`42`	`{`
`41`	`43`	`this.fieldBuilder = fieldBuilder;`
`42`	`44`	`field = fieldBuilder;`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`26`	`26`	`/// ByRef and provides indirect load/store support.`
`27`	`27`	`/// </summary>`
`28`	`28`	`[DebuggerDisplay("&{OwnerReference}")]`
`29`		`- internal class IndirectReference : TypeReference`
	`29`	`+ internal class IndirectReference : Reference`
`30`	`30`	`{`
`31`		`- private readonly TypeReference byRefReference;`
	`31`	`+ private readonly Reference byRefReference;`
`32`	`32`
`33`		`- public IndirectReference(TypeReference byRefReference)`
`34`		`- : base(byRefReference.Type.GetElementType())`
	`33`	`+ public IndirectReference(Reference byRefReference)`
	`34`	`+ : base(byRefReference.Type.GetElementType()!)`
`35`	`35`	`{`
`36`	`36`	`if (!byRefReference.Type.IsByRef)`
`37`	`37`	`{`
`@@ -59,15 +59,15 @@ public override void EmitStore(IExpression value, ILGenerator gen)`
`59`	`59`	`OpCodeUtil.EmitStoreIndirectOpCodeForType(gen, Type);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static TypeReference WrapIfByRef(TypeReference reference)`
	`62`	`+ public static Reference WrapIfByRef(Reference reference)`
`63`	`63`	`{`
`64`	`64`	`return reference.Type.IsByRef ? new IndirectReference(reference) : reference;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// TODO: Better name`
`68`		`- public static TypeReference[] WrapIfByRef(TypeReference[] references)`
	`68`	`+ public static Reference[] WrapIfByRef(Reference[] references)`
`69`	`69`	`{`
`70`		`- var result = new TypeReference[references.Length];`
	`70`	`+ var result = new Reference[references.Length];`
`71`	`71`
`72`	`72`	`for (var i = 0; i < references.Length; i++)`
`73`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`24`	`24`
`25`	`25`	`internal class ReferencesToObjectArrayExpression : IExpression`
`26`	`26`	`{`
`27`		`- private readonly TypeReference[] args;`
	`27`	`+ private readonly Reference[] args;`
`28`	`28`
`29`		`- public ReferencesToObjectArrayExpression(params TypeReference[] args)`
	`29`	`+ public ReferencesToObjectArrayExpression(params Reference[] args)`
`30`	`30`	`{`
`31`	`31`	`this.args = args;`
`32`	`32`	`}`
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.`
`@@ -25,7 +25,7 @@ namespace Castle.DynamicProxy.Generators`
`25`	`25`
`26`	`26`	`internal static class GeneratorUtil`
`27`	`27`	`{`
`28`		`- public static void CopyOutAndRefParameters(TypeReference[] dereferencedArguments, LocalReference invocation,`
	`28`	`+ public static void CopyOutAndRefParameters(Reference[] dereferencedArguments, LocalReference invocation,`
`29`	`29`	`MethodInfo method, MethodEmitter emitter)`
`30`	`30`	`{`
`31`	`31`	`var parameters = method.GetParameters();`
`@@ -131,12 +131,12 @@ bool IsReadOnly(ParameterInfo parameter)`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- private static ConvertExpression Argument(int i, LocalReference invocationArgs, TypeReference[] arguments)`
	`134`	`+ private static ConvertExpression Argument(int i, LocalReference invocationArgs, Reference[] arguments)`
`135`	`135`	`{`
`136`	`136`	`return new ConvertExpression(arguments[i].Type, new LoadRefArrayElementExpression(i, invocationArgs));`
`137`	`137`	`}`
`138`	`138`
`139`		`- private static AssignStatement AssignArgument(TypeReference[] dereferencedArguments, int i,`
	`139`	`+ private static AssignStatement AssignArgument(Reference[] dereferencedArguments, int i,`
`140`	`140`	`LocalReference invocationArgs)`
`141`	`141`	`{`
`142`	`142`	`return new AssignStatement(dereferencedArguments[i], Argument(i, invocationArgs, dereferencedArguments));`