WIP: NativeAOT-ios build adaptations

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -52,6 +52,13 @@
 		<_IsTrimmingEnabled>true</_IsTrimmingEnabled>
 		<!-- The GRCF property is contingent upon the HasRuntimeOutput property, which is only defined for executable projects. So, explicitly define GRCF for extension projects to avoid warnings at build time. -->
 		<GenerateRuntimeConfigurationFiles Condition="'$(IsAppExtension)' == 'true'">true</GenerateRuntimeConfigurationFiles>
+
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(PublishAot)' == 'true'" >
+		<IlcKeepManagedDebuggerSupport Condition=''>true</IlcKeepManagedDebuggerSupport>
+		<IlcCompileDependsOn>SetupOSSpecificProps;PrepareForILLink;_XamarinComputeIlcCompileInputs</IlcCompileDependsOn>
+		<CustomNativeMain>true</CustomNativeMain>
 	</PropertyGroup>
 
 	<!-- Set the default RuntimeIdentifier if not already specified. -->

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -426,6 +426,7 @@
 			_DetectAppManifest;
 			_ReadAppManifest;
 			_WriteAppManifest;
+			_ComputeManagedAssemblyToLink;
 		</_ComputeLinkerArgumentsDependsOn>
 	</PropertyGroup>
 
@@ -560,6 +561,10 @@
 			<_ExtraTrimmerArgs Condition="'$(Registrar)' == 'managed-static'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.IsManagedStaticRegistrar true</_ExtraTrimmerArgs>
 			<_ExtraTrimmerArgs Condition="'$(Registrar)' != 'managed-static'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.IsManagedStaticRegistrar false</_ExtraTrimmerArgs>
 
+			<!-- Set NativeAOT value -->
+			<_ExtraTrimmerArgs Condition="'$(_XamarinRuntime)' == 'NativeAOT'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.IsNativeAOT true</_ExtraTrimmerArgs>
+			<_ExtraTrimmerArgs Condition="'$(_XamarinRuntime)' != 'NativeAOT'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.IsNativeAOT false</_ExtraTrimmerArgs>
+
 			<!-- Enable serialization discovery. Ref: https://github.com/xamarin/xamarin-macios/issues/15676 -->
 			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --enable-serialization-discovery</_ExtraTrimmerArgs>
 
@@ -631,8 +636,8 @@
 			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.GenerateMainStep" />
 			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.GenerateReferencesStep" />
 			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.GatherFrameworksStep" />
-			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.Linker.ComputeNativeBuildFlagsStep" />
-			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.Linker.ComputeAOTArguments" />
+			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.Linker.ComputeNativeBuildFlagsStep" Condition="'$(_XamarinRuntime)' != 'NativeAOT'" />
+			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.Linker.ComputeAOTArguments" Condition="'$(_XamarinRuntime)' != 'NativeAOT'" />
 			<!-- Must be the last step. -->
 			<_TrimmerCustomSteps Include="$(_AdditionalTaskAssembly)" Type="Xamarin.Linker.DoneStep" />
 
@@ -783,8 +788,7 @@
 		</ItemGroup>
 	</Target>
 
-
-	<Target Name="_LoadLinkerOutput" DependsOnTargets="ComputeFilesToPublish" Condition="'$(IsMacEnabled)' == 'true'">
+	<Target Name="_LoadLinkerOutput" DependsOnTargets="_XamarinILLink;ComputeFilesToPublish" Condition="'$(IsMacEnabled)' == 'true'">
 		<!-- Load _MainFile -->
 		<ReadItemsFromFile SessionId="$(BuildSessionId)" File="$(_LinkerItemsDirectory)/_MainFile.items" Condition="Exists('$(_LinkerItemsDirectory)/_MainFile.items')">
 			<Output TaskParameter="Items" ItemName="_MainFile" />
@@ -936,7 +940,7 @@
 
 			<_AOTInputDirectory>$(_IntermediateNativeLibraryDir)aot-input/</_AOTInputDirectory>
 			<_AOTOutputDirectory>$(_IntermediateNativeLibraryDir)aot-output/</_AOTOutputDirectory>
-			<_IsDedupEnabled Condition="'$(_IsDedupEnabled)' == ''">true</_IsDedupEnabled>
+			<_IsDedupEnabled Condition="'$(_IsDedupEnabled)' == '' and '$(_XamarinRuntime)' == 'MonoVM'">true</_IsDedupEnabled>
 			<_DedupAssembly Condition="'$(_RunAotCompiler)' == 'true' And '$(IsMacEnabled)' == 'true' And '$(_IsDedupEnabled)' == 'true'">$(IntermediateOutputPath)aot-instances.dll</_DedupAssembly>
 
 			<_LibMonoLinkMode Condition="'$(_LibMonoLinkMode)' == '' And ('$(ComputedPlatform)' != 'iPhone' Or '$(_PlatformName)' == 'macOS')">dylib</_LibMonoLinkMode>
@@ -1124,6 +1128,55 @@
 		</ItemGroup>
 	</Target>
 
+	<Target Name="_XamarinILLink"
+		Inputs="@(ManagedAssemblyToLink)"
+		Outputs="@(ManagedAssemblyToLink->'$(IntermediateLinkDir)%(Filename)%(Extension)')"
+		DependsOnTargets="_RunILLink"
+		Condition="'$(_XamarinRuntime)' == 'NativeAOT'" />
+
+	<Target Name="_XamarinComputeIlcCompileInputs">
+		<PropertyGroup>
+			<_SystemModuleName>System.Private.CoreLib</_SystemModuleName>
+			<NativeLib>static</NativeLib>
+		</PropertyGroup>
+
+		<ItemGroup>
+			<TrimmerRootAssembly Remove="@(TrimmerRootAssembly)" />
+
+			<ManagedBinary Include="$(IntermediateLinkDir)$(TargetName)$(TargetExt)" />
+			<!-- Include SDK assemblies for ILC -->
+			<ManagedAssemblyReference Include="@(PrivateSdkAssemblies)" />
+			<!-- Include assemblies trimmed by ILLink with exception of SPC and application assembly -->
+			<ManagedAssemblyReference Include="@(ManagedAssemblyToLink->'$(IntermediateLinkDir)%(Filename)%(Extension)')"
+				Condition="'%(Filename)' != '$(_SystemModuleName)' and '%(Filename)' != '$(TargetName)' and Exists('$(IntermediateLinkDir)%(Filename)%(Extension)')"/>
+
+			<!-- Set inputs -->
+			<IlcCompileInput Include="@(ManagedBinary)" />
+			<IlcReference Include="@(ManagedAssemblyReference)" />
+			<DirectPInvoke Include="__Internal" />
+			<!-- Export UCO entrypoints from all assemblies, SPC is included by default -->
+			<!-- TODO: MSR could expose which assemblies need to be included in this list  -->
+			<UnmanagedEntryPointsAssembly Include="@(ManagedAssemblyReference->'%(Filename)')" Exclude="$(_SystemModuleName)" />
+
+			<!-- Set outputs -->
+			<_NativeExecutableObjectFiles Include="$(NativeObject)" />
+		</ItemGroup>
+	</Target>
+
+	<!-- Override the NativeAOT targets -->
+	<Target Name="_ComputeManagedAssemblyForILLink" Condition="'$(_XamarinRuntime)' == 'NativeAOT'" />
+	<Target Name="ComputeLinkedFilesToPublish" Condition="'$(_XamarinRuntime)' == 'NativeAOT'" />
+	<Target Name="LinkNative" Condition="'$(_XamarinRuntime)' == 'NativeAOT'" />
+	<Target Name="CopyNativeBinary" Condition="'$(_XamarinRuntime)' == 'NativeAOT'" />
+
+	<Target Name="_ExcludeBundlingUnusedFiles" Condition="'$(_XamarinRuntime)' == 'NativeAOT'"
+		DependsOnTargets="_GetCurrentAndPriorPublishFileWrites"
+		BeforeTargets="_IncrementalCleanPublishDirectory" >
+		<ItemGroup>
+			<ResolvedFileToPublish Remove="@(ResolvedFileToPublish)" Condition="'%(Extension)' == '.dll' or '%(Extension)' == '.dylib'" />
+		</ItemGroup>
+	</Target>
+
 	<PropertyGroup>
 		<_GenerateBindingsDependsOn>
 			_ComputeBindingVariables;
@@ -1168,6 +1221,10 @@
 			_ComputeNativeExecutableInputs;
 			_AOTCompile;
 		</_CompileNativeExecutableDependsOn>
+		<_CompileNativeExecutableDependsOn Condition="'$(PublishAot)' == 'true'">
+			$(_CompileNativeExecutableDependsOn);
+			IlcCompile;
+		</_CompileNativeExecutableDependsOn>
 	</PropertyGroup>
 
 	<Target Name="_CompileNativeExecutable"
@@ -1213,23 +1270,35 @@
 	<Target Name="_ComputeLinkNativeExecutableInputs" Condition="'$(IsMacEnabled)' == 'true'">
 		<ItemGroup>
 			<_XamarinMainLibraries Include="$(_XamarinNativeLibraryDirectory)/$(_LibXamarinName)" />
+			<!-- Take collected static libs from ILC build integration targets -->
+			<_NativeAOTLibrary Include="@(LinkerArg)" Condition="'%(Extension)' == '.a'" />
+
 			<!-- Link with the libraries shipped with the mono runtime pack -->
-			<_XamarinMainLibraries Include="@(_MonoLibrary)" />
+			<_XamarinMainLibraries Condition="'$(_XamarinRuntime)' == 'MonoVM'" Include="@(_MonoLibrary)" />
+
+			<!-- Link with the libraries shipped with the NativeAOT runtime pack -->
+			<_XamarinMainLibraries Condition="'$(_XamarinRuntime)' == 'NativeAOT'" Include="@(_NativeAOTLibrary)" />
 
 			<!-- The frameworks we need to link with (both weakly and normally) -->
 			<_NativeExecutableFrameworks Include="@(_LinkerFrameworks)" />
 
 			<!-- CFNetwork is required by xamarin_start_wwan -->
 			<_NativeExecutableFrameworks Include="CFNetwork" Condition="'$(_PlatformName)' == 'iOS'" />
 
-			<!-- Mono requires zlib, iconv, and the "Compression framework" -->
+			<!-- Mono and NativeAOT require zlib, iconv, and the "Compression framework" -->
 			<_MainLinkerFlags Include="-lz" />
 			<_MainLinkerFlags Include="-liconv" />
 			<_MainLinkerFlags Include="-lcompression" />
 
+			<!-- NativeAOT requires setting preallocated thungs and icucore -->
+			<_MainLinkerFlags Condition="'$(_XamarinRuntime)' == 'NativeAOT'" Include="-Wl,-segprot,__THUNKS,rx,rx" />
+			<_MainLinkerFlags Condition="'$(_XamarinRuntime)' == 'NativeAOT'" Include="-licucore" />
+
 			<!-- Here we must add all the files that should make us (re-)link the executable -->
 			<_LinkNativeExecutableInputs Include="@(_NativeExecutableObjectFiles)" />
 			<_LinkNativeExecutableInputs Include="@(_XamarinMainLibraries)" />
+			<_FileNativeReference Remove="@(_FileNativeReference)" />
+			<_FileNativeReference Include="@(NativeLibrary)" />
 			<_LinkNativeExecutableInputs Include="@(_FileNativeReference)" />
 		</ItemGroup>
 	</Target>
@@ -1477,7 +1546,7 @@
 				Condition=" '$(_PlatformName)' != 'macOS' And
 				            '$(InvariantGlobalization)' != 'true' And
 				            '%(ResolvedFileToPublish.Filename)%(ResolvedFileToPublish.Extension)' == '$(_GlobalizationDataFile)' And
-				            '%(ResolvedFileToPublish.NuGetPackageId)' == '$(_MonoNugetPackageId)'
+				            ('%(ResolvedFileToPublish.NuGetPackageId)' == '$(_MonoNugetPackageId)' or '$(_XamarinRuntime)' == 'NativeAOT')
 				            "
 				PublishFolderType="Assembly"
 			/>

msbuild/Xamarin.MacDev.Tasks/Tasks/CompileNativeCodeTaskBase.cs

@@ -43,6 +43,8 @@ public override bool Execute ()
 				arguments.Add ("clang");
 				arguments.Add ("-g");
 
+				arguments.Add ("-D CORECLR_RUNTIME");
+
 				var arch = info.GetMetadata ("Arch");
 
 				switch (Platform) {

runtime/coreclr-bridge.m

@@ -481,6 +481,9 @@
 bool
 xamarin_bridge_vm_initialize (int propertyCount, const char **propertyKeys, const char **propertyValues)
 {
+#if NATIVEAOT
+	return true;
+#else
 	int rv;
 
 	int combinedPropertyCount = 0;
@@ -510,6 +513,7 @@
 	LOG_CORECLR (stderr, "xamarin_vm_initialize (%i, %p, %p): rv: %i domainId: %i handle: %p\n", combinedPropertyCount, combinedPropertyKeys, combinedPropertyValues, rv, coreclr_domainId, coreclr_handle);
 
 	return rv == 0;
+#endif
 }
 
 void
@@ -556,9 +560,11 @@
 void
 xamarin_bridge_register_product_assembly (GCHandle* exception_gchandle)
 {
+#if !defined (NATIVEAOT)
 	MonoAssembly *assembly;
 	assembly = xamarin_open_and_register (PRODUCT_DUAL_ASSEMBLY, exception_gchandle);
 	xamarin_mono_object_release (&assembly);
+#endif
 }
 
 MonoMethod *
@@ -740,6 +746,7 @@
 	return rv;
 }
 
+#if !defined (NATIVEAOT)
 int
 mono_jit_exec (MonoDomain * domain, MonoAssembly * assembly, int argc, const char** argv)
 {
@@ -769,6 +776,7 @@
 
 	return (int) exitCode;
 }
+#endif
 
 MonoGHashTable *
 mono_g_hash_table_new_type (GHashFunc hash_func, GEqualFunc key_equal_func, MonoGHashGCType type)

runtime/monotouch-main.m

@@ -441,6 +441,7 @@ - (void) memoryWarning: (NSNotification *) sender
 	if (xamarin_register_assemblies != NULL)
 		xamarin_register_assemblies ();
 
+#if !defined (NATIVEAOT)
 	if (xamarin_executable_name) {
 		assembly = xamarin_open_and_register (xamarin_executable_name, &exception_gchandle);
 		xamarin_process_fatal_exception_gchandle (exception_gchandle, "An exception occurred while opening the main executable");
@@ -460,6 +461,10 @@ - (void) memoryWarning: (NSNotification *) sender
 		xamarin_mono_object_release (&rassembly);
 		xamarin_process_fatal_exception_gchandle (exception_gchandle, "An exception occurred while opening the entry assembly");
 	}
+#else
+	assembly = NULL;
+	(void)exception_gchandle;
+#endif
 
 	DEBUG_LAUNCH_TIME_PRINT ("\tAssembly register time");
 

runtime/nativeaot-bridge.m

@@ -32,4 +32,20 @@
 	runtime_initialize (options, exception_gchandle);
 }
 
+typedef int (*managed_entry_point)(int argc, const char* argv[]);
+
+int
+mono_jit_exec (MonoDomain * domain, MonoAssembly * assembly, int argc, const char** argv)
+{
+	void *del;
+	managed_entry_point app_main;
+
+	del = dlsym (RTLD_DEFAULT, "__managed__Main");
+	if (del == NULL)
+		xamarin_assertion_message ("mono_jit_exec: failed to load managed_entry_point: %s\n", dlerror ());
+	app_main = (managed_entry_point) del;
+
+	return app_main (argc, argv);
+}
+
 #endif // NATIVEAOT

src/Foundation/NSObject2.cs

@@ -293,17 +293,17 @@ internal Flags FlagsInternal {
 		}
 #endif
 
-#if !NET || !__MACOS__
+#if !NET || (!__MACOS__ && !__IOS__)
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
 		extern static void RegisterToggleRef (NSObject obj, IntPtr handle, bool isCustomType);
-#endif // !NET || !__MACOS__
+#endif // !NET || (!__MACOS__ && !__IOS__)
 
 		[DllImport ("__Internal")]
 		static extern void xamarin_release_managed_ref (IntPtr handle, [MarshalAs (UnmanagedType.I1)] bool user_type);
 
 		static void RegisterToggleReference (NSObject obj, IntPtr handle, bool isCustomType)
 		{
-#if NET && __MACOS__
+#if NET && (__MACOS__ || __IOS__)
 			Runtime.RegisterToggleReferenceCoreCLR (obj, handle, isCustomType);
 #else
 			RegisterToggleRef (obj, handle, isCustomType);

src/ILLink.Substitutions.ios.xml

@@ -4,7 +4,8 @@
       <method signature="System.Void WarnOnce()" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" />
     </type>
     <type fullname="ObjCRuntime.Runtime">
-      <method signature="System.Boolean get_IsCoreCLR()" body="stub" value="false" />
+      <method signature="System.Boolean get_IsCoreCLR()" body="stub" feature="ObjCRuntime.Runtime.IsNativeAOT" featurevalue="false" value="false" />
+      <method signature="System.Boolean get_IsCoreCLR()" body="stub" feature="ObjCRuntime.Runtime.IsNativeAOT" featurevalue="true" value="true" />
       <method signature="System.Int32 GetRuntimeArch()" body="stub" feature="ObjCRuntime.Runtime.Arch.IsSimulator" featurevalue="false" value="0" />
       <method signature="System.Int32 GetRuntimeArch()" body="stub" feature="ObjCRuntime.Runtime.Arch.IsSimulator" featurevalue="true" value="1" />
       <method signature="System.Boolean get_IsManagedStaticRegistrar()" body="stub" feature="ObjCRuntime.Runtime.IsManagedStaticRegistrar" featurevalue="false" value="false" />

tools/common/Application.cs

@@ -1481,6 +1481,8 @@ public bool IsInterpreted (string assembly)
 		public bool IsAOTCompiled (string assembly)
 		{
 #if NET
+			if (XamarinRuntime == XamarinRuntime.NativeAOT)
+				return true;
 			if (Platform == ApplePlatform.MacOSX)
 				return false; // AOT on .NET for macOS hasn't been implemented yet.
 #else

tools/common/Target.cs

@@ -689,7 +689,7 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
 
 			register_assemblies.AppendLine ("\tGCHandle exception_gchandle = INVALID_GCHANDLE;");
 			foreach (var s in assemblies) {
-				if (!s.IsAOTCompiled)
+				if (!s.IsAOTCompiled || App.XamarinRuntime == XamarinRuntime.NativeAOT)
 					continue;
 
 				var info = s.AssemblyDefinition.Name.Name;
@@ -797,7 +797,7 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
 				} else {
 					sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_INTERP);");
 				}
-			} else if (app.IsDeviceBuild) {
+			} else if (app.IsDeviceBuild && App.XamarinRuntime == XamarinRuntime.MonoVM) {
 				sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_FULL);");
 			} else if (app.Platform == ApplePlatform.MacCatalyst && ((abi & Abi.ARM64) == Abi.ARM64)) {
 				sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_FULL);");

tools/common/XamarinRuntime.cs

@@ -2,5 +2,6 @@ namespace Xamarin.Bundler {
 	public enum XamarinRuntime {
 		MonoVM,
 		CoreCLR,
+		NativeAOT,
 	}
 }

tools/dotnet-linker/Steps/GenerateReferencesStep.cs

@@ -36,9 +36,19 @@ protected override void TryEndProcess ()
 				Configuration.WriteOutputForMSBuild ("_ReferencesFile", items);
 				break;
 			case SymbolMode.Linker:
-				foreach (var symbol in required_symbols) {
-					var item = new MSBuildItem ("-u" + symbol.Prefix + symbol.Name);
-					items.Add (item);
+				if (App.XamarinRuntime != XamarinRuntime.NativeAOT)
+				{
+					foreach (var symbol in required_symbols) {
+						var item = new MSBuildItem ("-u" + symbol.Prefix + symbol.Name);
+						items.Add (item);
+					}
+				}
+				else
+				{
+					// FIXME:
+					items.Add (new MSBuildItem ("-u_xamarin_objcruntime_runtime_nativeaotinitialize"));
+					items.Add (new MSBuildItem ("-u___managed__Main" ));
+					items.Add (new MSBuildItem ("-u_NativeAOT_StaticInitialization" ));
 				}
 				Configuration.WriteOutputForMSBuild ("_ReferencesLinkerFlags", items);
 				break;