Move the created delegate types

Author: radekdoulik

tools/jnimarshalmethod-gen/App.cs

@@ -292,6 +292,7 @@ void CreateMarshalMethodAssembly (string path)
 			var destDir         = string.IsNullOrEmpty (outDirectory) ? Path.GetDirectoryName (path) : outDirectory;
 			var builder         = CreateExportedMemberBuilder ();
 			var matchType       = typeNameRegexes.Count > 0;
+			var newDelegates    = new List<Type> ();
 
 			if (Verbose)
 				ColorWriteLine ($"Preparing marshal method assembly '{assemblyName}'", ConsoleColor.Cyan);
@@ -421,7 +422,7 @@ void CreateMarshalMethodAssembly (string path)
 					if (signature == null)
 						signature = builder.GetJniMethodSignature (method);
 
-					registrationElements.Add (CreateRegistration (name, signature, lambda, targetType, methodName, dm));
+					registrationElements.Add (CreateRegistration (name, signature, lambda, targetType, methodName, dm, newDelegates));
 
 					addedMethods.Add (methodName);
 				}
@@ -443,7 +444,7 @@ void CreateMarshalMethodAssembly (string path)
 			if (!string.IsNullOrEmpty (outDirectory))
 				path = Path.Combine (outDirectory, Path.GetFileName (path));
 
-			var mover = new TypeMover (dstAssembly, ad, path, definedTypes, resolver, cache);
+			var mover = new TypeMover (dstAssembly, ad, path, newDelegates, definedTypes, resolver, cache);
 			mover.Move ();
 
 			if (!keepTemporary)
@@ -478,7 +479,7 @@ static void CreateDelegateRuntimeManagedMethod (TypeBuilder tb, string name, Typ
 			mb.SetImplementationFlags (System.Reflection.MethodImplAttributes.Runtime | System.Reflection.MethodImplAttributes.Managed);
 		}
 
-		static Expression CreateRegistration (string method, string signature, LambdaExpression lambda, ParameterExpression targetType, string methodName, ModuleBuilder dm)
+		static Expression CreateRegistration (string method, string signature, LambdaExpression lambda, ParameterExpression targetType, string methodName, ModuleBuilder dm, List<Type> createdDelegateList)
 		{
 			Expression registrationDelegateType = null;
 			if (lambda.Type.Assembly == typeof (object).Assembly ||
@@ -521,6 +522,7 @@ static Expression CreateRegistration (string method, string signature, LambdaExp
 						CreateDelegateRuntimeManagedMethod (dtb, "EndInvoke", typeof (bool), new Type [] { typeof (IAsyncResult) });
 
 						existingType = dtb.CreateType ();
+						createdDelegateList.Add (existingType);
 					}
 
 					delegateTypeName = existingType.FullName;

tools/jnimarshalmethod-gen/TypeMover.cs

@@ -14,17 +14,19 @@ public class TypeMover
 		AssemblyDefinition Source { get; }
 		AssemblyDefinition Destination { get; }
 		string DestinationPath { get; }
+		List<Type> DelegateTypes { get; }
 		Dictionary<string, System.Reflection.Emit.TypeBuilder> Types { get; }
 		DirectoryAssemblyResolver Resolver { get; }
 
 		MethodReference consoleWriteLine;
 		TypeDefinitionCache cache;
 
-		public TypeMover (AssemblyDefinition source, AssemblyDefinition destination, string destinationPath, Dictionary<string, System.Reflection.Emit.TypeBuilder> types, DirectoryAssemblyResolver resolver, TypeDefinitionCache cache)
+		public TypeMover (AssemblyDefinition source, AssemblyDefinition destination, string destinationPath, List<Type> delegateTypes, Dictionary<string, System.Reflection.Emit.TypeBuilder> types, DirectoryAssemblyResolver resolver, TypeDefinitionCache cache)
 		{
 			Source = source;
 			Destination = destination;
 			DestinationPath = destinationPath;
+			DelegateTypes = delegateTypes;
 			Types = types;
 			Resolver = resolver;
 			this.cache = cache;
@@ -45,6 +47,11 @@ public void Move ()
 			typeMap.Clear ();
 			resolvedTypeMap.Clear ();
 
+			foreach (var type in DelegateTypes) {
+				MoveDelegate (type);
+				movedTypesCount++;
+			}
+
 			foreach (var type in Types.Values) {
 				Move (type);
 				movedTypesCount++;
@@ -71,6 +78,34 @@ bool TypeIsEmptyOrHasOnlyDefaultConstructor (TypeDefinition type)
 			return !type.HasMethods || (type.Methods.Count == 1 && type.Methods [0].IsConstructor);
 		}
 
+		void MoveDelegate (Type type)
+		{
+			var typeSrc = Source.MainModule.GetType (type.GetCecilName ());
+			var typeDst = new TypeDefinition ("", typeSrc.Name, typeSrc.Attributes);
+			var module = Destination.MainModule;
+
+			if (App.Verbose) {
+				Console.Write ($"Moving delegate type ");
+				App.ColorWrite ($"{typeSrc.FullName},{typeSrc.Module.FileName}", ConsoleColor.Yellow);
+				Console.Write (" to ");
+				App.ColorWriteLine ($"{Destination.MainModule.FileName}", ConsoleColor.Yellow);
+			}
+
+			typeDst.BaseType = GetUpdatedType (typeSrc.BaseType, module);
+
+			foreach (var m in typeSrc.Methods) {
+				var md = new MethodDefinition (m.Name, m.Attributes, GetUpdatedType (m.ReturnType, module));
+				md.ImplAttributes = m.ImplAttributes;
+
+				foreach (var p in m.Parameters)
+					md.Parameters.Add (new ParameterDefinition (p.Name, p.Attributes, GetUpdatedType (p.ParameterType, module)));
+
+				typeDst.Methods.Add (md);
+			}
+
+			Destination.MainModule.Types.Add (typeDst);
+		}
+
 		void Move (Type type)
 		{
 			var typeSrc = Source.MainModule.GetType (type.GetCecilName ());
@@ -343,6 +378,7 @@ MethodReference GetActionConstructor (TypeReference type, ModuleDefinition modul
 					var mr = GetUpdatedMethod (m, module);
 					if (type is GenericInstanceType)
 						mr.DeclaringType = type;
+
 					return mr;
 				}
 			}