[XABT] Separate marshal method storage from MarshalMethodClassifier to MarshalMethodsCollection.

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FindJavaObjectsStep.cs

@@ -119,8 +119,10 @@ List<CallableWrapperType> ConvertToCallableWrappers (List<TypeDefinition> types)
 			DefaultMonoRuntimeInitialization = "mono.MonoPackageManager.LoadApplication (context);",
 		};
 
-		if (UseMarshalMethods)
-			reader_options.MethodClassifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
+		if (UseMarshalMethods) {
+			var classifier = new MarshalMethodsClassifier (Context, Context.Resolver, Log);
+			reader_options.MethodClassifier = new MarshalMethodsCollection (classifier);
+		}
 
 		foreach (var type in types) {
 			var wrapper = CecilImporter.CreateType (type, Context, reader_options);

src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs

@@ -212,25 +212,28 @@ internal static Dictionary<string, ITaskItem> MaybeGetArchAssemblies (Dictionary
 			XAAssemblyResolver resolver = MakeResolver (useMarshalMethods, arch, assemblies);
 			var tdCache = new TypeDefinitionCache ();
 			(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) = ScanForJavaTypes (resolver, tdCache, assemblies, userAssemblies, useMarshalMethods);
-			var jcwContext = new JCWGeneratorContext (arch, resolver, assemblies.Values, javaTypesForJCW, tdCache, useMarshalMethods);
+			var jcwContext = new JCWGeneratorContext (arch, resolver, assemblies.Values, javaTypesForJCW, tdCache);
 			var jcwGenerator = new JCWGenerator (Log, jcwContext) {
 				CodeGenerationTarget = codeGenerationTarget,
 			};
-			bool success;
+			bool success = true;
 
 			if (generateJavaCode && RunCheckedBuild) {
-				success = jcwGenerator.GenerateAndClassify (AndroidSdkPlatform, outputPath: Path.Combine (OutputDirectory, "src"), ApplicationJavaClass);
+				success = jcwGenerator.Generate (AndroidSdkPlatform, outputPath: Path.Combine (OutputDirectory, "src"), ApplicationJavaClass);
 
 				generatedJavaFiles = jcwGenerator.GeneratedJavaFiles;
-			} else {
-				success = jcwGenerator.Classify (AndroidSdkPlatform);
 			}
 
 			if (!success) {
 				return (false, null);
 			}
 
-			return (true, new NativeCodeGenState (arch, tdCache, resolver, allJavaTypes, javaTypesForJCW, jcwGenerator.Classifier));
+			MarshalMethodsCollection? marshalMethodsCollection = null;
+
+			if (useMarshalMethods)
+				marshalMethodsCollection = MarshalMethodsCollection.FromAssemblies (arch, assemblies.Values.ToList (), resolver, Log);
+
+			return (true, new NativeCodeGenState (arch, tdCache, resolver, allJavaTypes, javaTypesForJCW, marshalMethodsCollection));
 		}
 
 		(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) ScanForJavaTypes (XAAssemblyResolver res, TypeDefinitionCache cache, Dictionary<string, ITaskItem> assemblies, Dictionary<string, ITaskItem> userAssemblies, bool useMarshalMethods)

src/Xamarin.Android.Build.Tasks/Tasks/GenerateMainAndroidManifest.cs

@@ -177,7 +177,7 @@ void GenerateAdditionalProviderSources (NativeCodeGenState codeGenState, IList<s
 		regCallsWriter.WriteLine ("// Application and Instrumentation ACWs must be registered first.");
 		foreach (TypeDefinition type in codeGenState.JavaTypesForJCW) {
 			if (JavaNativeTypeManager.IsApplication (type, codeGenState.TypeCache) || JavaNativeTypeManager.IsInstrumentation (type, codeGenState.TypeCache)) {
-				if (codeGenState.Classifier != null && !codeGenState.Classifier.FoundDynamicallyRegisteredMethods (type)) {
+				if (codeGenState.Classifier != null && !codeGenState.Classifier.TypeHasDynamicallyRegisteredMethods (type)) {
 					continue;
 				}
 

src/Xamarin.Android.Build.Tasks/Tasks/RewriteMarshalMethods.cs

@@ -1,5 +1,6 @@
 #nullable enable
 using System.Collections.Concurrent;
+using System.Linq;
 using Microsoft.Android.Build.Tasks;
 using Microsoft.Build.Framework;
 using Xamarin.Android.Tools;
@@ -51,13 +52,15 @@ public override bool RunTask ()
 			}
 
 			Log.LogDebugMessage ($"[{state.TargetArch}] Number of generated marshal methods: {state.Classifier.MarshalMethods.Count}");
-			if (state.Classifier.RejectedMethodCount > 0) {
-				Log.LogWarning ($"[{state.TargetArch}] Number of methods in the project that will be registered dynamically: {state.Classifier.RejectedMethodCount}");
+			if (state.Classifier.DynamicallyRegisteredMarshalMethods.Count > 0) {
+				Log.LogWarning ($"[{state.TargetArch}] Number of methods in the project that will be registered dynamically: {state.Classifier.DynamicallyRegisteredMarshalMethods.Count}");
 			}
 
-			if (state.Classifier.WrappedMethodCount > 0) {
+			var wrappedCount = state.Classifier.MarshalMethods.Sum (m => m.Value.Count (m2 => m2.NeedsBlittableWorkaround));
+
+			if (wrappedCount > 0) {
 				// TODO: change to LogWarning once the generator can output code which requires no non-blittable wrappers
-				Log.LogDebugMessage ($"[{state.TargetArch}] Number of methods in the project that need marshal method wrappers: {state.Classifier.WrappedMethodCount}");
+				Log.LogDebugMessage ($"[{state.TargetArch}] Number of methods in the project that need marshal method wrappers: {wrappedCount}");
 			}
 		}
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MarshalMethodTests.cs

@@ -0,0 +1,199 @@
+#nullable enable
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using NUnit.Framework;
+using Xamarin.Android.Tasks;
+using Xamarin.ProjectTools;
+
+namespace Xamarin.Android.Build.Tests;
+
+public class MarshalMethodTests : BaseTest
+{
+	[Test]
+	public void MarshalMethodsCollectionScanning ()
+	{
+		// This test does 2 things:
+		// - Builds a binding project in Debug mode to create an assembly that contains convertible
+		//   marshal methods to ensure they are found by MarshalMethodsCollection
+		// - Builds the same project in Release mode which rewrites the assembly to ensure those
+		//   same marshal methods can be found after they are rewritten
+		var proj = new XamarinAndroidApplicationProject {
+			ProjectName = "mmtest",
+		};
+
+		proj.Sources.Add (new AndroidItem.AndroidLibrary ("javaclasses.jar") {
+			BinaryContent = () => ResourceData.JavaSourceJarTestJar,
+		});
+
+		proj.AndroidJavaSources.Add (new AndroidItem.AndroidJavaSource ("JavaSourceTestInterface.java") {
+			Encoding = Encoding.ASCII,
+			TextContent = () => ResourceData.JavaSourceTestInterface,
+			Metadata = { { "Bind", "True" } },
+		});
+
+		proj.AndroidJavaSources.Add (new AndroidItem.AndroidJavaSource ("JavaSourceTestExtension.java") {
+			Encoding = Encoding.ASCII,
+			TextContent = () => ResourceData.JavaSourceTestExtension,
+			Metadata = { { "Bind", "True" } },
+		});
+
+		proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_MAINACTIVITY}", """
+			// Implements Java interface method
+			class MyGreeter : Java.Lang.Object, Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface {
+			    public virtual string? GreetWithQuestion (string? p0, Java.Util.Date? p1, string? p2) => "greetings!";
+			}
+
+			// Overrides implemented Java interface method
+			class MyExtendedGreeter : MyGreeter {
+			    public override string? GreetWithQuestion (string? p0, Java.Util.Date? p1, string? p2) => "more greetings!";
+			}
+
+			// Implements Java interface method (duplicate)
+			class MyGreeter2 : Java.Lang.Object, Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface {
+			    public virtual string? GreetWithQuestion (string? p0, Java.Util.Date? p1, string? p2) => "duplicate greetings!";
+			}
+
+			// Overrides Java class method
+			class MyOverriddenGreeter : Com.Xamarin.Android.Test.Msbuildtest.JavaSourceTestExtension {
+			    public override string? GreetWithQuestion (string? p0, Java.Util.Date? p1, string? p2) => "even more greetings!";
+			}
+		""");
+
+		var builder = CreateApkBuilder ();
+		Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
+		builder.AssertHasNoWarnings ();
+
+		var intermediateDebugOutputPath = Path.Combine (Root, builder.ProjectDirectory, proj.IntermediateOutputPath, "android", "assets", "arm64-v8a");
+		var outputDebugDll = Path.Combine (intermediateDebugOutputPath, $"{proj.ProjectName}.dll");
+
+		var log = new TaskLoggingHelper (new MockBuildEngine (TestContext.Out, [], [], []), nameof (MarshalMethodsCollectionScanning));
+		var xaResolver = new XAAssemblyResolver (Tools.AndroidTargetArch.Arm64, log, false);
+		xaResolver.SearchDirectories.Add (Path.GetDirectoryName (outputDebugDll)!);
+
+		var collection = MarshalMethodsCollection.FromAssemblies (Tools.AndroidTargetArch.Arm64, [CreateItem (outputDebugDll, "arm64-v8a")], xaResolver, log);
+
+		Assert.AreEqual (3, collection.MarshalMethods.Count);
+		Assert.AreEqual (0, collection.ConvertedMarshalMethods.Count);
+
+		var key1 = "Android.App.Activity, Mono.Android\tOnCreate";
+		var key2 = "Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface, mmtest\tGreetWithQuestion";
+		var key3 = "Com.Xamarin.Android.Test.Msbuildtest.JavaSourceTestExtension, mmtest\tGreetWithQuestion";
+
+		Assert.AreEqual (1, collection.MarshalMethods [key1].Count);
+		Assert.AreEqual (2, collection.MarshalMethods [key2].Count);
+		Assert.AreEqual (1, collection.MarshalMethods [key3].Count);
+
+		AssertMarshalMethodData (collection.MarshalMethods [key1] [0],
+			callbackField: null,
+			connector: "System.Delegate Android.App.Activity::GetOnCreate_Landroid_os_Bundle_Handler()",
+			declaringType: "mmtest.MainActivity",
+			implementedMethod: "System.Void mmtest.MainActivity::OnCreate(Android.OS.Bundle)",
+			jniMethodName: "onCreate",
+			jniMethodSignature: "(Landroid/os/Bundle;)V",
+			jniTypeName: "com/xamarin/marshalmethodscollectionscanning/MainActivity",
+			nativeCallback: "System.Void Android.App.Activity::n_OnCreate_Landroid_os_Bundle_(System.IntPtr,System.IntPtr,System.IntPtr)",
+			registeredMethod: "System.Void Android.App.Activity::OnCreate(Android.OS.Bundle)");
+
+		AssertMarshalMethodData (collection.MarshalMethods [key2] [0],
+			callbackField: null,
+			connector: "System.Delegate Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterfaceInvoker::GetGreetWithQuestion_Ljava_lang_String_Ljava_util_Date_Ljava_lang_String_Handler()",
+			declaringType: "mmtest.MyGreeter",
+			implementedMethod: "System.String Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface::GreetWithQuestion(System.String,Java.Util.Date,System.String)",
+			jniMethodName: "greetWithQuestion",
+			jniMethodSignature: "(Ljava/lang/String;Ljava/util/Date;Ljava/lang/String;)Ljava/lang/String;",
+			jniTypeName: "crc644a923d2fc5ca7023/MyGreeter",
+			nativeCallback: "System.IntPtr Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterfaceInvoker::n_GreetWithQuestion_Ljava_lang_String_Ljava_util_Date_Ljava_lang_String_(System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr)",
+			registeredMethod: "System.String Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface::GreetWithQuestion(System.String,Java.Util.Date,System.String)");
+
+		AssertMarshalMethodData (collection.MarshalMethods [key2] [1],
+			callbackField: null,
+			connector: "System.Delegate Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterfaceInvoker::GetGreetWithQuestion_Ljava_lang_String_Ljava_util_Date_Ljava_lang_String_Handler()",
+			declaringType: "mmtest.MyGreeter2",
+			implementedMethod: "System.String Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface::GreetWithQuestion(System.String,Java.Util.Date,System.String)",
+			jniMethodName: "greetWithQuestion",
+			jniMethodSignature: "(Ljava/lang/String;Ljava/util/Date;Ljava/lang/String;)Ljava/lang/String;",
+			jniTypeName: "crc644a923d2fc5ca7023/MyGreeter2",
+			nativeCallback: "System.IntPtr Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterfaceInvoker::n_GreetWithQuestion_Ljava_lang_String_Ljava_util_Date_Ljava_lang_String_(System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr)",
+			registeredMethod: "System.String Com.Xamarin.Android.Test.Msbuildtest.IJavaSourceTestInterface::GreetWithQuestion(System.String,Java.Util.Date,System.String)");
+
+		AssertMarshalMethodData (collection.MarshalMethods [key3] [0],
+			callbackField: null,
+			connector: "System.Delegate Com.Xamarin.Android.Test.Msbuildtest.JavaSourceTestExtension::GetGreetWithQuestion_Ljava_lang_String_Ljava_util_Date_Ljava_lang_String_Handler()",
+			declaringType: "mmtest.MyOverriddenGreeter",
+			implementedMethod: "System.String mmtest.MyOverriddenGreeter::GreetWithQuestion(System.String,Java.Util.Date,System.String)",
+			jniMethodName: "greetWithQuestion",
+			jniMethodSignature: "(Ljava/lang/String;Ljava/util/Date;Ljava/lang/String;)Ljava/lang/String;",
+			jniTypeName: "crc644a923d2fc5ca7023/MyOverriddenGreeter",
+			nativeCallback: "System.IntPtr Com.Xamarin.Android.Test.Msbuildtest.JavaSourceTestExtension::n_GreetWithQuestion_Ljava_lang_String_Ljava_util_Date_Ljava_lang_String_(System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr)",
+			registeredMethod: "System.String Com.Xamarin.Android.Test.Msbuildtest.JavaSourceTestExtension::GreetWithQuestion(System.String,Java.Util.Date,System.String)");
+
+		// Recompile with Release so marshal methods get rewritten
+		proj.IsRelease = true;
+
+		Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
+		builder.AssertHasNoWarnings ();
+
+		// Rescan for modified marshal methods
+		var intermediateReleaseOutputPath = Path.Combine (Root, builder.ProjectDirectory, proj.IntermediateOutputPath, "android-arm64", "linked");
+		var outputReleaseDll = Path.Combine (intermediateReleaseOutputPath, $"{proj.ProjectName}.dll");
+
+		xaResolver = new XAAssemblyResolver (Tools.AndroidTargetArch.Arm64, log, false);
+		xaResolver.SearchDirectories.Add (Path.GetDirectoryName (outputReleaseDll)!);
+
+		var releaseCollection = MarshalMethodsCollection.FromAssemblies (Tools.AndroidTargetArch.Arm64, [CreateItem (outputReleaseDll, "arm64-v8a")], xaResolver, log);
+
+		Assert.AreEqual (0, releaseCollection.MarshalMethods.Count);
+		Assert.AreEqual (3, releaseCollection.ConvertedMarshalMethods.Count);
+
+		AssertRewrittenMethodData (releaseCollection.ConvertedMarshalMethods [key1] [0], collection.MarshalMethods [key1] [0]);
+		AssertRewrittenMethodData (releaseCollection.ConvertedMarshalMethods [key2] [0], collection.MarshalMethods [key2] [0]);
+		AssertRewrittenMethodData (releaseCollection.ConvertedMarshalMethods [key2] [1], collection.MarshalMethods [key2] [1]);
+		AssertRewrittenMethodData (releaseCollection.ConvertedMarshalMethods [key3] [0], collection.MarshalMethods [key3] [0]);
+	}
+
+	void AssertMarshalMethodData (MarshalMethodEntry entry, string? callbackField, string? connector, string? declaringType,
+		string? implementedMethod, string? jniMethodName, string? jniMethodSignature, string? jniTypeName,
+		string? nativeCallback, string? registeredMethod)
+	{
+		Assert.AreEqual (callbackField, entry.CallbackField?.ToString (), "Callback field should be the same.");
+		Assert.AreEqual (connector, entry.Connector?.ToString (), "Connector should be the same.");
+		Assert.AreEqual (declaringType, entry.DeclaringType.ToString (), "Declaring type should be the same.");
+		Assert.AreEqual (implementedMethod, entry.ImplementedMethod?.ToString (), "Implemented method should be the same.");
+		Assert.AreEqual (jniMethodName, entry.JniMethodName, "JNI method name should be the same.");
+		Assert.AreEqual (jniMethodSignature, entry.JniMethodSignature, "JNI method signature should be the same.");
+		Assert.AreEqual (jniTypeName, entry.JniTypeName, "JNI type name should be the same.");
+		Assert.AreEqual (nativeCallback, entry.NativeCallback.ToString (), "Native callback should be the same.");
+		Assert.AreEqual (registeredMethod, entry.RegisteredMethod?.ToString (), "Registered method should be the same.");
+	}
+
+	void AssertRewrittenMethodData (ConvertedMarshalMethodEntry converted, MarshalMethodEntry entry)
+	{
+		// Things that are different between the two:
+		Assert.IsNull (converted.CallbackField, "Callback field will be null.");
+		Assert.IsNull (converted.Connector, "Connector will be null.");
+
+		var nativeCallback = converted.NativeCallback?.ToString () ?? "";
+		var paren = nativeCallback.IndexOf ('(');
+		var convertedNativeCallback = nativeCallback.Substring (0, paren) + "_mm_wrapper" + nativeCallback.Substring (paren);
+		Assert.AreEqual (convertedNativeCallback, converted.ConvertedNativeCallback?.ToString (), "ConvertedNativeCallback should be the same.");
+
+		// Things that should be the same between the two:
+		Assert.AreEqual (entry.DeclaringType.ToString (), converted.DeclaringType.ToString (), "Declaring type should be the same.");
+		Assert.AreEqual (entry.ImplementedMethod?.ToString (), converted.ImplementedMethod?.ToString (), "Implemented method should be the same.");
+		Assert.AreEqual (entry.JniMethodName, converted.JniMethodName, "JNI method name should be the same.");
+		Assert.AreEqual (entry.JniMethodSignature, converted.JniMethodSignature, "JNI method signature should be the same.");
+		Assert.AreEqual (entry.JniTypeName, converted.JniTypeName, "JNI type name should be the same.");
+		Assert.AreEqual (entry.NativeCallback.ToString (), converted.NativeCallback?.ToString (), "Native callback should be the same.");
+		Assert.AreEqual (entry.RegisteredMethod?.ToString (), converted.RegisteredMethod?.ToString (), "Registered method should be the same.");
+	}
+
+	static ITaskItem CreateItem (string itemSpec, string abi)
+	{
+		var item = new TaskItem (itemSpec);
+		item.SetMetadata ("Abi", abi);
+		return item;
+	}
+}