From 4c2ddcf3497b4f7c662055786300fffcea8ac805 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 18 May 2022 11:27:28 +0200
Subject: [PATCH] [dotnet-linker] Bump default trampoline count when using the
 interpreter on x64 in .NET. Fixes #14887. (#15025)

Fixes https://github.com/xamarin/xamarin-macios/issues/14887.
---
 dotnet/targets/Xamarin.Shared.Sdk.targets  |  2 +-
 tools/common/Application.cs                | 30 ++++++++++++++++++++++
 tools/dotnet-linker/LinkerConfiguration.cs |  5 ++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 8c5f3ebf43..427c10d6b1 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -463,6 +463,7 @@
 			<_CustomLinkerOptions>
 				AreAnyAssembliesTrimmed=$(_AreAnyAssembliesTrimmed)
 				AssemblyName=$(AssemblyName).dll
+				@(_AotArguments -> 'AOTArgument=%(Identity)')
 				AOTCompiler=$(_AOTCompiler)
 				AOTOutputDirectory=$(_AOTOutputDirectory)
 				AppBundleManifestPath=$(_AppBundleManifestPath)
@@ -996,7 +997,6 @@
 		<AOTCompile
 			SessionId="$(BuildSessionId)"
 			Condition="'$(IsMacEnabled)' == 'true'"
-			AotArguments="@(_AotArguments)"
 			Assemblies="@(_AssembliesToAOT)"
 			AOTCompilerPath="$(_AOTCompiler)"
 			InputDirectory="$(_AOTInputDirectory)"
diff --git a/tools/common/Application.cs b/tools/common/Application.cs
index ab12a7cb84..6aaa585763 100644
--- a/tools/common/Application.cs
+++ b/tools/common/Application.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -1606,6 +1607,35 @@ namespace Xamarin.Bundler {
 			aotArguments.Add ($"outfile={outputFile}");
 			if (enable_llvm)
 				aotArguments.Add ($"llvm-outfile={llvmOutputFile}");
+
+#if NET
+			// If the interpreter is enabled, and we're building for x86_64, we're AOT-compiling but we
+			// don't have access to infinite trampolines. So we're bumping the trampoline count (unless
+			// the developer has already set a value) to something higher than the default.
+			//
+			// Ref:
+			// * https://github.com/xamarin/xamarin-macios/issues/14887
+			// * https://github.com/dotnet/runtime/issues/68808
+			if (interp && (abi & Abi.x86_64) == Abi.x86_64) {
+				// The default values are here: https://github.com/dotnet/runtime/blob/main/src/mono/mono/mini/aot-compiler.c#L13945-L13953
+				// Let's try 4x the default values.
+				var trampolines = new []
+				{
+					(Name: "ntrampolines", Default: 4096),
+					(Name: "nrgctx-trampolines", Default: 4096),
+					(Name: "nimt-trampolines", Default: 512),
+					(Name: "nrgctx-fetch-trampolines", Default: 128),
+					(Name: "ngsharedvt-trampolines", Default: 512),
+					(Name: "nftnptr-arg-trampolines", Default: 128),
+					(Name: "nunbox-arbitrary-trampolines", Default: 256),
+				};
+				foreach (var tramp in trampolines) {
+					var nameWithEq = tramp.Name + "=";
+					if (!aotArguments.Any (v => v.StartsWith (nameWithEq, StringComparison.Ordinal)))
+						aotArguments.Add (nameWithEq + (tramp.Default * 4).ToString (CultureInfo.InvariantCulture));
+				}
+			}
+#endif
 		}
 
 		public string AssemblyName {
diff --git a/tools/dotnet-linker/LinkerConfiguration.cs b/tools/dotnet-linker/LinkerConfiguration.cs
index 572d72b23e..9d5a85294e 100644
--- a/tools/dotnet-linker/LinkerConfiguration.cs
+++ b/tools/dotnet-linker/LinkerConfiguration.cs
@@ -115,6 +115,10 @@ namespace Xamarin.Linker {
 					// This is the AssemblyName MSBuild property for the main project (which is also the root/entry assembly)
 					Application.RootAssemblies.Add (value);
 					break;
+				case "AOTArgument":
+					if (!string.IsNullOrEmpty (value))
+						Application.AotArguments.Add (value);
+					break;
 				case "AOTCompiler":
 					AOTCompiler = value;
 					break;
@@ -380,6 +384,7 @@ namespace Xamarin.Linker {
 			if (Verbosity > 0) {
 				Console.WriteLine ($"LinkerConfiguration:");
 				Console.WriteLine ($"    ABIs: {string.Join (", ", Abis.Select (v => v.AsArchString ()))}");
+				Console.WriteLine ($"    AOTArguments: {string.Join (", ", Application.AotArguments)}");
 				Console.WriteLine ($"    AOTOutputDirectory: {AOTOutputDirectory}");
 				Console.WriteLine ($"    AppBundleManifestPath: {Application.InfoPListPath}");
 				Console.WriteLine ($"    AreAnyAssembliesTrimmed: {Application.AreAnyAssembliesTrimmed}");