Add support for NativeAOT on macOS

src/ObjCRuntime/Runtime.cs

@@ -621,6 +621,12 @@ static IntPtr PrintAllExceptions (IntPtr exception_gchandle)
 		// For XM it will also register all assemblies loaded in the current appdomain.
 		internal static void RegisterAssemblies ()
 		{
+#if NET
+			if (IsNativeAOT) {
+				return;
+			}
+#endif
+
 #if PROFILE
 			var watch = new Stopwatch ();
 #endif

tests/bindings-test/ProtocolTest.cs

@@ -22,7 +22,6 @@ public class ProtocolTest {
 						return false;
 				}
 
-
 				return true;
 			}
 		}

tests/monotouch-test/AppKit/DerivedEventTest.cs

@@ -42,7 +42,9 @@ void TestDelegates (NSComboBox b)
 		[Test]
 		public void DerivedEvents_OverwriteThrows ()
 		{
-#if RELEASE
+#if NATIVEAOT
+			var checkTrimmedAway = true;
+#elif RELEASE
 			var checkTrimmedAway = TestRuntime.IsLinkAll;
 #else
 			var checkTrimmedAway = false;

tests/monotouch-test/AppKit/NSView.cs

@@ -73,8 +73,13 @@ public void AllItemsWithNSMenuShouldAllowNull ()
 			foreach (var ctor in types) {
 				var o = ctor ();
 				var prop = o.GetType ().GetProperty ("Menu", BindingFlags.Public | BindingFlags.Instance);
+#if NATIVEAOT
+				if (prop is null)
+					continue; // the property was linked away.
+#else
 				if (prop is null && TestRuntime.IsLinkAll)
 					continue; // the property was linked away.
+#endif
 				prop.SetValue (o, null, null);
 			}
 

tests/monotouch-test/ObjCRuntime/EveryFrameworkSmokeTest.cs

@@ -85,6 +85,7 @@ LoadStatus CheckLoadFailure (string libraryName, string path)
 			return LoadStatus.FailTest;
 		}
 
+#if !NATIVEAOT
 		[Test]
 		public void ExpectedLibrariesAreLoaded ()
 		{
@@ -106,6 +107,7 @@ public void ExpectedLibrariesAreLoaded ()
 			if (failures.Count > 0)
 				Assert.Fail (string.Join ("\n", failures));
 		}
+#endif
 	}
 }
 #endif // __MACOS__

tests/monotouch-test/ObjCRuntime/RegistrarTest.cs

@@ -111,7 +111,7 @@ public void RegistrarRemoval ()
 			// It's not safe to remove the dynamic registrar in monotouch-test (by design; some of the tested API makes it unsafe, and the linker correctly detects this),
 			// so the dynamic registrar will only be removed if manually requested.
 			// Also removal of the dynamic registrar is not supported in XM
-#if (OPTIMIZEALL && !__MACOS__) || NATIVEAOT
+#if (OPTIMIZEALL || NATIVEAOT) && !__MACOS__
 			var shouldBeRemoved = true;
 #else
 			var shouldBeRemoved = false;
@@ -2246,7 +2246,7 @@ public void TestCtors ()
 			}
 		}
 
-#if __MACOS__
+#if __MACOS__ && !NATIVEAOT
 		[Test]
 		public void CustomUserTypeWithDynamicallyLoadedAssembly ()
 		{

tests/mtouch/Cache.cs

@@ -18,7 +18,11 @@ public static class Cache // Not really a cache (since the root directory is cle
 
 		static Cache ()
 		{
+#if NATIVEAOT
+			root = Path.Combine (Path.GetDirectoryName (Environment.ProcessPath)!, "tmp-test-dir");
+#else
 			root = Path.Combine (Path.GetDirectoryName (System.Reflection.Assembly.GetExecutingAssembly ().Location)!, "tmp-test-dir");
+#endif
 			if (Directory.Exists (root)) {
 				var movedRoot = root + DateTime.UtcNow.Ticks.ToString () + "-deletion-in-progress";
 				// The temporary directory can be big, and it can take a while to clean it out.

tests/xharness/Jenkins/TestVariationsFactory.cs

@@ -169,9 +169,8 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 						if (test.Platform != TestPlatform.MacCatalyst) {
 							yield return new TestData { Variation = "Debug (static registrar)", Registrar = "static", Debug = true, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.Mac), };
 							yield return new TestData { Variation = "Debug (static registrar, ARM64)", Registrar = "static", Debug = true, Profiling = false, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.Mac) || !mac_supports_arm64, RuntimeIdentifier = arm64_runtime_identifier, };
-							// Pending: We need the NativeAOT's runtime bits to ship using runtime packs for macOS (https://github.com/dotnet/runtime/issues/87060) before we can enable this
-							// yield return new TestData { Variation = "Release (NativeAOT)", Debug = false, PublishAot = true, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.Mac), Defines = "NATIVEAOT", LinkMode = "Full" };
-							// yield return new TestData { Variation = "Release (NativeAOT, ARM64)", Debug = false, PublishAot = true, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.Mac) || !mac_supports_arm64, Defines = "NATIVEAOT", RuntimeIdentifier = arm64_runtime_identifier, LinkMode = "Full" };
+							yield return new TestData { Variation = "Release (NativeAOT, ARM64)", Debug = false, PublishAot = true, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.Mac) || !mac_supports_arm64, Defines = "NATIVEAOT", RuntimeIdentifier = arm64_runtime_identifier, LinkMode = "SdkOnly" };
+							yield return new TestData { Variation = "Release (NativeAOT, x64)", Debug = false, PublishAot = true, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.Mac), Defines = "NATIVEAOT", RuntimeIdentifier = "osx-x64", LinkMode = "SdkOnly" };
 						}
 						if (test.Platform == TestPlatform.MacCatalyst) {
 							yield return new TestData { Variation = "Release (ARM64, LLVM)", Debug = false, UseLlvm = true, Ignored = !jenkins.TestSelection.IsEnabled (TestLabel.Monotouch) || !jenkins.TestSelection.IsEnabled (PlatformLabel.MacCatalyst) || !mac_supports_arm64, RuntimeIdentifier = arm64_runtime_identifier };

tools/common/Optimizations.cs

@@ -264,7 +264,7 @@ public void Initialize (Application app, out List<ProductException> messages)
 
 			// We will register protocols if the static registrar is enabled and loading assemblies is not possible
 			if (!RegisterProtocols.HasValue) {
-				if (app.Platform != ApplePlatform.MacOSX) {
+				if (app.Platform != ApplePlatform.MacOSX || app.XamarinRuntime == XamarinRuntime.NativeAOT) {
 					RegisterProtocols = (app.Registrar == RegistrarMode.Static || app.Registrar == RegistrarMode.ManagedStatic) && !app.UseInterpreter;
 				} else {
 					RegisterProtocols = false;

tools/common/StaticRegistrar.cs

@@ -3426,6 +3426,12 @@ bool SpecializeTrampoline (AutoIndentStringBuilder sb, ObjCMethod method, List<E
 				sb.AppendLine ("}");
 				return true;
 			case Trampoline.CopyWithZone2:
+#if NET
+				// Managed Static Registrar handles CopyWithZone2 in GenerateCallToUnmanagedCallersOnlyMethod
+				if (LinkContext.App.Registrar == RegistrarMode.ManagedStatic) {
+					return false;
+				}
+#endif
 				sb.AppendLine ("-(id) copyWithZone: (NSZone *) zone");
 				sb.AppendLine ("{");
 				sb.AppendLine ("return xamarin_copyWithZone_trampoline2 (self, _cmd, zone);");
@@ -3474,6 +3480,7 @@ bool TryGetReturnType (ObjCMethod method, string descriptiveMethodName, List<Exc
 			case Trampoline.X86_DoubleABI_StretTrampoline:
 			case Trampoline.StaticStret:
 			case Trampoline.Stret:
+			case Trampoline.CopyWithZone2:
 				switch (method.NativeReturnType.FullName) {
 				case "System.Int64":
 					rettype = "long long";
@@ -4353,6 +4360,14 @@ void GenerateCallToUnmanagedCallersOnlyMethod (AutoIndentStringBuilder sb, ObjCM
 				sb.WriteLine ($"bool call_super = false;");
 			if (hasReturnType)
 				sb.WriteLine ($"{callbackReturnType} rv = {{ 0 }};");
+			if (method.CurrentTrampoline == Trampoline.CopyWithZone2) {
+				sb.WriteLine ("id p0 = (id)zone;");
+				sb.WriteLine ("GCHandle gchandle;");
+				sb.WriteLine ("enum XamarinGCHandleFlags flags = XamarinGCHandleFlags_None;");
+				sb.WriteLine ("gchandle = xamarin_get_gchandle_with_flags (self, &flags);");
+				sb.WriteLine ("if (gchandle != INVALID_GCHANDLE)");
+				sb.Indent ().WriteLine ("xamarin_set_gchandle_with_flags (self, INVALID_GCHANDLE, XamarinGCHandleFlags_None);").Unindent ();
+			}
 
 			if (!staticCall) {
 				sb.WriteLine ($"static {ucoEntryPoint}_function {ucoEntryPoint};");
@@ -4376,6 +4391,11 @@ void GenerateCallToUnmanagedCallersOnlyMethod (AutoIndentStringBuilder sb, ObjCM
 				GenerateCallToSuperForConstructor (sb, method, exceptions);
 			}
 
+			if (method.CurrentTrampoline == Trampoline.CopyWithZone2) {
+				sb.WriteLine ("if (gchandle != INVALID_GCHANDLE)");
+				sb.Indent ().WriteLine ("xamarin_set_gchandle_with_flags (self, gchandle, flags);").Unindent ();
+			}
+
 			if (hasReturnType)
 				sb.WriteLine ("return rv;");
 

tools/linker/CoreOptimizeGeneratedCode.cs

@@ -153,7 +153,7 @@ public override bool IsActiveFor (AssemblyDefinition assembly)
 
 			// process only assemblies where the linker is enabled (e.g. --linksdk, --linkskip) 
 			AssemblyAction action = Annotations.GetAction (assembly);
-			if (action != AssemblyAction.Link) {
+			if (action != AssemblyAction.Link && action != AssemblyAction.Save) {
 #if DEBUG
 				Console.WriteLine ("Assembly {0} : skipped ({1})", assembly, action);
 #endif

tools/linker/RegistrarRemovalTrackingStep.cs

@@ -133,7 +133,8 @@ bool RequiresDynamicRegistrar (AssemblyDefinition assembly, bool warnIfRequired)
 						//
 						// and these overloads don't need the dynamic registrar, which means we only have
 						// to look in assemblies that aren't linked.
-						if (Annotations.GetAction (assembly) == AssemblyAction.Link && Optimizations.OptimizeBlockLiteralSetupBlock == true)
+						var action = Annotations.GetAction (assembly);
+						if ((action == AssemblyAction.Link || action == AssemblyAction.Save) && Optimizations.OptimizeBlockLiteralSetupBlock == true)
 							break;
 
 						switch (mr.Name) {