Use ConvertArgument... AST node types in 2nd marshaller

Author: stakx

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

@@ -23,9 +23,8 @@ internal class ConvertArgumentFromObjectExpression : IExpression
 		private readonly IExpression obj;
 		private Type dereferencedArgumentType;
 
-		public ConvertArgumentFromObjectExpression(Reference obj, Type dereferencedArgumentType)
+		public ConvertArgumentFromObjectExpression(IExpression obj, Type dereferencedArgumentType)
 		{
-			Debug.Assert(obj.Type == typeof(object));
 			Debug.Assert(dereferencedArgumentType.IsByRef == false);
 
 			this.obj = obj;

src/Castle.Core/DynamicProxy/Generators/InvocationTypeGenerator.cs

@@ -300,12 +300,12 @@ public void CopyOut(out IExpression[] arguments, out LocalReference?[] byRefArgu
 					else
 #endif
 					{
-						dereferencedArgument = new ConvertExpression(
-							dereferencedArgumentType,
+						dereferencedArgument = new ConvertArgumentFromObjectExpression(
 							new MethodInvocationExpression(
 								ThisExpression.Instance,
 								InvocationMethods.GetArgumentValue,
-								new LiteralIntExpression(i)));
+								new LiteralIntExpression(i)),
+							dereferencedArgumentType);
 					}
 
 					if (argumentType.IsByRef)
@@ -353,10 +353,7 @@ public void CopyIn(LocalReference?[] byRefArguments)
 								ThisExpression.Instance,
 								InvocationMethods.SetArgumentValue,
 								new LiteralIntExpression(i),
-								new ConvertExpression(
-									typeof(object),
-									localCopy.Type,
-									localCopy)));
+								new ConvertArgumentToObjectExpression(localCopy)));
 					}
 				}
 			}
@@ -381,10 +378,7 @@ public void SetReturnValue(LocalReference returnValue)
 					method.CodeBuilder.AddStatement(new MethodInvocationExpression(
 						ThisExpression.Instance,
 						InvocationMethods.SetReturnValue,
-						new ConvertExpression(
-							typeof(object),
-							returnValue.Type,
-							returnValue)));
+						new ConvertArgumentToObjectExpression(returnValue)));
 				}
 			}
 		}