Blazor hang with marshal methods

build-tools/create-packs/Microsoft.Android.Runtime.proj

@@ -41,6 +41,7 @@ projects that use the Microsoft.Android framework in .NET 6+.
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so" />
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so" />
       <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libxamarin-debug-app-helper.so" />
+      <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmarshal-methods-tracing.a" />
       <FrameworkListFileClass Include="@(_AndroidRuntimePackAssemblies->'%(Filename)%(Extension)')" Profile="Android" />
       <FrameworkListFileClass Include="@(_AndroidRuntimePackAssets->'%(Filename)%(Extension)')" Profile="Android" />
     </ItemGroup>

src/Mono.Android/Java.Interop/TypeManager.cs

@@ -223,8 +223,10 @@ static Exception CreateJavaLocationException ()
 
 			if (!JNIEnvInit.IsRunningOnDesktop) {
 				// Miss message is logged in the native runtime
-				if (JNIEnvInit.LogAssemblyCategory)
+				if (JNIEnvInit.LogAssemblyCategory) {
 					JNIEnv.LogTypemapTrace (new System.Diagnostics.StackTrace (true));
+					RuntimeNativeMethods.monodroid_log (LogLevel.Warn, LogCategories.Assembly, CreateJavaLocationException ().ToString ());
+				}
 				return null;
 			}
 

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

@@ -249,7 +249,7 @@ void Run (DirectoryAssemblyResolver res, bool useMarshalMethods)
 						targetPaths.Add (Path.Combine (IntermediateOutputDirectory, "linked"));
 					} else {
 						foreach (string abi in SupportedAbis) {
-							targetPaths.Add (Path.Combine (IntermediateOutputDirectory, AbiToRid (abi), "linked"));
+							targetPaths.Add (Path.Combine (IntermediateOutputDirectory, MonoAndroidHelper.AbiToRid (abi), "linked"));
 						}
 					}
 				}
@@ -432,26 +432,6 @@ void StoreMarshalAssemblyPath (string name, ITaskItem asm)
 
 				assemblyPaths.Add (asm.ItemSpec);
 			}
-
-			string AbiToRid (string abi)
-			{
-				switch (abi) {
-					case "arm64-v8a":
-						return "android-arm64";
-
-					case "armeabi-v7a":
-						return "android-arm";
-
-					case "x86":
-						return "android-x86";
-
-					case "x86_64":
-						return "android-x64";
-
-					default:
-						throw new InvalidOperationException ($"Internal error: unsupported ABI '{abi}'");
-				}
-			}
 		}
 
 		bool CreateJavaSources (IEnumerable<TypeDefinition> javaTypes, TypeDefinitionCache cache, MarshalMethodsClassifier classifier, bool useMarshalMethods)

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

@@ -66,6 +66,7 @@ public class GeneratePackageManagerJava : AndroidTask
 		public bool InstantRunEnabled { get; set; }
 
 		public bool EnableMarshalMethods { get; set; }
+		public bool EnableMarshalMethodTracing { get; set; }
 		public string RuntimeConfigBinFilePath { get; set; }
 		public string BoundExceptionType { get; set; }
 
@@ -410,7 +411,8 @@ void AddEnvironment ()
 					assemblyCount,
 					uniqueAssemblyNames,
 					marshalMethodsState?.MarshalMethods,
-					Log
+					Log,
+					EnableMarshalMethodTracing
 				);
 			} else {
 				marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (assemblyCount, uniqueAssemblyNames);

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

@@ -16,6 +16,8 @@ namespace Xamarin.Android.Tasks
 {
 	public class LinkApplicationSharedLibraries : AndroidAsyncTask
 	{
+		const int NDK_API_LEVEL = 21; // TODO: don't hardcode the API level
+
 		public override string TaskPrefix => "LAS";
 
 		sealed class Config
@@ -29,6 +31,7 @@ sealed class InputFiles
 		{
 			public List<string> ObjectFiles;
 			public string OutputSharedLibrary;
+			public List<string> ExtraLibraries;
 		}
 
 		[Required]
@@ -43,6 +46,10 @@ sealed class InputFiles
 		[Required]
 		public string AndroidBinUtilsDirectory { get; set; }
 
+		public string AndroidNdkDirectory { get; set; }
+
+		public bool EnableMarshalMethodTracing { get; set; }
+
 		public override System.Threading.Tasks.Task RunTaskAsync ()
 		{
 			return this.WhenAll (GetLinkerConfigs (), RunLinker);
@@ -112,14 +119,44 @@ void RunLinker (Config config)
 
 		IEnumerable<Config> GetLinkerConfigs ()
 		{
+			NdkTools ndk = null;
+			string clangRuntimeDirTop = null;
+
+			if (EnableMarshalMethodTracing) {
+				ndk = NdkTools.Create (AndroidNdkDirectory, logErrors: false, log: Log);
+
+				// Doesn't matter for which arch we run the compiler, they all share the same topmost runtime dir
+				string clangPath = ndk.GetToolPath (NdkToolKind.CompilerCPlusPlus, AndroidTargetArch.Arm64, NDK_API_LEVEL);
+				int ret = MonoAndroidHelper.RunProcess (
+					clangPath, "-print-runtime-dir",
+					(object sender, DataReceivedEventArgs e) => { // stdout
+						if (clangRuntimeDirTop == null && !String.IsNullOrEmpty (e.Data)) {
+							clangRuntimeDirTop = e.Data;
+						}
+					},
+					(object sender, DataReceivedEventArgs e) => { // stderr
+						if (!String.IsNullOrEmpty (e.Data)) {
+							Log.LogError (e.Data);
+						}
+					}
+				);
+
+				if (ret != 0) {
+					Log.LogError ($"Failed to obtain clang runtime path from {clangPath}");
+				}
+			}
+
+			string runtimeNativeLibsDir = Path.GetFullPath (Path.Combine (AndroidBinUtilsDirectory, "..", "..", "..", "lib"));
 			var abis = new Dictionary <string, InputFiles> (StringComparer.Ordinal);
 			ITaskItem[] dsos = ApplicationSharedLibraries;
 			foreach (ITaskItem item in dsos) {
 				string abi = item.GetMetadata ("abi");
-				abis [abi] = GatherFilesForABI(item.ItemSpec, abi, ObjectFiles);
+				abis [abi] = GatherFilesForABI (item.ItemSpec, abi, ObjectFiles, runtimeNativeLibsDir, ndk, clangRuntimeDirTop);
 			}
 
 			const string commonLinkerArgs =
+				"--shared " +
+				"--allow-shlib-undefined " +
 				"--unresolved-symbols=ignore-in-shared-libs " +
 				"--export-dynamic " +
 				"-soname libxamarin-app.so " +
@@ -132,7 +169,7 @@ IEnumerable<Config> GetLinkerConfigs ()
 				"--warn-shared-textrel " +
 				"--fatal-warnings";
 
-			string stripSymbolsArg = DebugBuild ? String.Empty : " -s";
+			string stripSymbolsArg = DebugBuild || EnableMarshalMethodTracing ? String.Empty : " -s";
 
 			string ld = Path.Combine (AndroidBinUtilsDirectory, MonoAndroidHelper.GetExecutablePath (AndroidBinUtilsDirectory, "ld"));
 			var targetLinkerArgs = new List<string> ();
@@ -177,6 +214,12 @@ IEnumerable<Config> GetLinkerConfigs ()
 				targetLinkerArgs.Add ("-o");
 				targetLinkerArgs.Add (QuoteFileName (inputs.OutputSharedLibrary));
 
+				if (inputs.ExtraLibraries != null) {
+					foreach (string lib in inputs.ExtraLibraries) {
+						targetLinkerArgs.Add (lib);
+					}
+				}
+
 				string targetArgs = String.Join (" ", targetLinkerArgs);
 				yield return new Config {
 					LinkerPath = ld,
@@ -186,11 +229,39 @@ IEnumerable<Config> GetLinkerConfigs ()
 			}
 		}
 
-		InputFiles GatherFilesForABI (string runtimeSharedLibrary, string abi, ITaskItem[] objectFiles)
+		InputFiles GatherFilesForABI (string runtimeSharedLibrary, string abi, ITaskItem[] objectFiles, string runtimeNativeLibsDir, NdkTools ndk, string clangRuntimeDirTop)
 		{
+			List<string> extraLibraries = null;
+
+			if (EnableMarshalMethodTracing) {
+				if (ndk == null) {
+					throw new ArgumentNullException (nameof (ndk));
+				}
+
+				AndroidTargetArch targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
+				string clangRuntimeAbi = MonoAndroidHelper.ArchToClangRuntimeAbi (targetArch);
+				string clangLibraryAbi = MonoAndroidHelper.ArchToClangLibraryAbi (targetArch);
+				string unwindLibPath = Path.GetFullPath (Path.Combine (clangRuntimeDirTop, clangRuntimeAbi, "libunwind.a"));
+				string builtinsLibPath = Path.GetFullPath (Path.Combine (clangRuntimeDirTop, $"libclang_rt.builtins-{clangLibraryAbi}-android.a"));
+				string libPath = ndk.GetDirectoryPath (NdkToolchainDir.PlatformLib, targetArch, NDK_API_LEVEL);
+				string cxxAbiLibPath = Path.GetFullPath (Path.Combine (libPath, "..", "libc++abi.a"));
+
+				extraLibraries = new List<string> {
+					Path.Combine (runtimeNativeLibsDir, MonoAndroidHelper.AbiToRid (abi), "libmarshal-methods-tracing.a"),
+					$"-L \"{libPath}\"",
+					$"\"{builtinsLibPath}\"",
+					$"\"{cxxAbiLibPath}\"",
+					$"\"{unwindLibPath}\"",
+					"-lc",
+					"-ldl",
+					"-llog", // tracing uses android logger
+				};
+			}
+
 			return new InputFiles {
 				OutputSharedLibrary = runtimeSharedLibrary,
 				ObjectFiles = GetItemsForABI (abi, objectFiles),
+				ExtraLibraries = extraLibraries,
 			};
 		}
 

src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunction.cs

@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Reflection;
 
 namespace Xamarin.Android.Tasks.LLVMIR
 {
@@ -90,7 +89,7 @@ class LlvmIrFunction
 		uint localSlot = 0;
 		uint indentLevel = 1;
 
-		public LlvmIrFunction (string name, Type returnType, int attributeSetID, List<LlvmIrFunctionParameter>? parameters = null)
+		public LlvmIrFunction (string name, Type returnType, int attributeSetID, IList<LlvmIrFunctionParameter>? parameters = null)
 		{
 			if (String.IsNullOrEmpty (name)) {
 				throw new ArgumentException ("must not be null or empty", nameof (name));

src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.Code.cs

@@ -23,21 +23,20 @@ abstract partial class LlvmIrGenerator
 
 		bool codeOutputInitialized = false;
 
-		/// <summary>
-		/// Writes the function definition up to the opening curly brace
-		/// </summary>
-		public void WriteFunctionStart (LlvmIrFunction function, string? comment = null)
+		void ValidateFunction (LlvmIrFunction function, out LlvmFunctionAttributeSet? attributes)
 		{
 			if (function == null) {
 				throw new ArgumentNullException (nameof (function));
 			}
 
-			LlvmFunctionAttributeSet? attributes = null;
+			attributes = null;
 			if (function.AttributeSetID >= 0 && !FunctionAttributes.TryGetValue (function.AttributeSetID, out attributes)) {
 				throw new InvalidOperationException ($"Function '{function.Name}' refers to attribute set that does not exist (ID: {function.AttributeSetID})");
 			}
+		}
 
-			Output.WriteLine ();
+		void WriteFunctionSignature (LlvmIrFunction function, string statementKindKeyword, LlvmFunctionAttributeSet? attributes, string? comment)
+		{
 			if (!String.IsNullOrEmpty (comment)) {
 				foreach (string line in comment.Split ('\n')) {
 					WriteCommentLine (line);
@@ -48,12 +47,34 @@ public void WriteFunctionStart (LlvmIrFunction function, string? comment = null)
 				WriteCommentLine ($"Function attributes: {attributes.Render ()}");
 			}
 
-			Output.Write ($"define {GetKnownIRType (function.ReturnType)} @{function.Name} (");
+			Output.Write ($"{statementKindKeyword} {GetKnownIRType (function.ReturnType)} @{function.Name} (");
 			WriteFunctionParameters (function.Parameters, writeNames: true);
 			Output.Write(") local_unnamed_addr ");
 			if (attributes != null) {
 				Output.Write ($"#{function.AttributeSetID}");
 			}
+		}
+
+		/// <summary>
+		/// Writes function forward declaration
+		/// </summary>
+		public void WriteFunctionForwardDeclaration (LlvmIrFunction function, string? comment = null)
+		{
+			ValidateFunction (function, out LlvmFunctionAttributeSet? attributes);
+
+			Output.WriteLine ();
+			WriteFunctionSignature (function, "declare", attributes, comment);
+			Output.WriteLine (";");
+		}
+
+		/// <summary>
+		/// Writes the function definition up to the opening curly brace
+		/// </summary>
+		public void WriteFunctionStart (LlvmIrFunction function, string? comment = null)
+		{
+			ValidateFunction (function, out LlvmFunctionAttributeSet? attributes);
+			Output.WriteLine ();
+			WriteFunctionSignature (function, "define", attributes, comment);
 			Output.WriteLine ();
 			Output.WriteLine ("{");
 		}
@@ -397,6 +418,9 @@ public void EmitLabel (LlvmIrFunction function, string labelName)
 						} else {
 							throw new InvalidOperationException ($"Unexpected pointer type in argument {i}, '{argument.Type}'");
 						}
+					} else if (argument.Value is string str) {
+						StringSymbolInfo info = StringManager.Add (str);
+						WriteGetStringPointer (info.SymbolName, info.Size, indent: false, detectBitness: true, skipPointerType: true);
 					} else {
 						Output.Write (argument.Value.ToString ());
 					}