Blazor hang with marshal methods

.gitmodules

@@ -42,3 +42,7 @@
     path = external/xamarin-android-tools
     url = https://github.com/xamarin/xamarin-android-tools
     branch = main
+[submodule "external/libunwind"]
+	path = external/libunwind
+	url = https://github.com/libunwind/libunwind.git
+	branch = v1.7-stable

Configuration.props

@@ -121,6 +121,8 @@
     <MingwZlibRootDirectory64>$(MingwZlibRootDirectory)\x86_64-w64-mingw32</MingwZlibRootDirectory64>
     <MingwZlibLibraryName>libz.a</MingwZlibLibraryName>
     <SqliteSourceDirectory Condition=" '$(SqliteSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\sqlite</SqliteSourceDirectory>
+    <LibUnwindSourceDirectory Condition=" '$(LibUnwindSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libunwind</LibUnwindSourceDirectory>
+    <LibUnwindGeneratedHeadersDirectory Condition=" '$(LibUnwindGeneratedHeadersDirectory)' == '' ">$(BootstrapOutputDirectory)\libunwind</LibUnwindGeneratedHeadersDirectory>
     <XamarinAndroidSourcePath>$(MSBuildThisFileDirectory)</XamarinAndroidSourcePath>
     <ThirdPartySourcePath>$(MSBuildThisFileDirectory)src-ThirdParty\</ThirdPartySourcePath>
     <AllSupported32BitTargetAndroidAbis>armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
@@ -175,6 +177,8 @@
     <MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
     <LinkerSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LinkerSourceDirectory)'))</LinkerSourceFullPath>
     <SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
+    <LibUnwindSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindSourceDirectory)'))</LibUnwindSourceFullPath>
+    <LibUnwindGeneratedHeadersFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindGeneratedHeadersDirectory)'))</LibUnwindGeneratedHeadersFullPath>
     <OpenTKSourceFullPath>$([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)'))</OpenTKSourceFullPath>
   </PropertyGroup>
   <PropertyGroup>

Xamarin.Android.sln

@@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Diagnost
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Cecil", "external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj", "{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libunwind", "src\libunwind-xamarin\libunwind-xamarin.csproj", "{F8E4961B-C427-47F9-92D6-0BEB5B76B3D7}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "monodroid", "src\monodroid\monodroid.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.NUnitLite", "src\Xamarin.Android.NUnitLite\Xamarin.Android.NUnitLite.csproj", "{4D603AA3-3BFD-43C8-8050-0CD6C2601126}"

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

@@ -41,6 +41,8 @@ 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" />
+      <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libclang_rt.builtins-*-android.a" />
       <FrameworkListFileClass Include="@(_AndroidRuntimePackAssemblies->'%(Filename)%(Extension)')" Profile="Android" />
       <FrameworkListFileClass Include="@(_AndroidRuntimePackAssets->'%(Filename)%(Extension)')" Profile="Android" />
     </ItemGroup>

build-tools/installers/create-installers.targets

@@ -320,12 +320,20 @@
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ManifestOverlays\Timing.xml" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm64\libc.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm64\libm.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm64\libdl.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm64\liblog.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm\libc.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm\libm.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm\libdl.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-arm\liblog.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x64\libc.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x64\libm.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x64\libdl.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x64\liblog.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x86\libc.so" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x86\libm.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x86\libdl.so" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libstubs\android-x86\liblog.so" />
   </ItemGroup>
   <ItemGroup>
     <_MSBuildTargetsSrcFiles Include="$(MSBuildTargetsSrcDir)\Xamarin.Android.AvailableItems.targets" />

build-tools/xaprepare/xaprepare/Application/GeneratedMonodroidCmakeFiles.cs

@@ -63,6 +63,8 @@ void GenerateShellConfig (Context context, StreamWriter sw)
 				{ "@NinjaPath@", "${NINJA}" },
 				{ "@OUTPUT_DIRECTORY@", "${__OUTPUT_DIR}" },
 				{ "@SOURCE_DIRECTORY@", "${MONODROID_SOURCE_DIR}" },
+				{ "@LibUnwindSourceFullPath@", "${LIBUNWIND_SOURCE_FULL_PATH}" },
+				{ "@LibUnwindGeneratedHeadersFullPath@", "${LIBUNWIND_HEADERS_FULL_PATH}" },
 			};
 
 			var androidRuntimeReplacements = new Dictionary<string, string> (StringComparer.Ordinal) {
@@ -98,6 +100,8 @@ void GenerateShellConfig (Context context, StreamWriter sw)
 			sw.WriteLine ($"NINJA=\"{context.Properties.GetRequiredValue(KnownProperties.NinjaPath)}\"");
 			sw.WriteLine ($"XA_BUILD_CONFIGURATION={context.Configuration}");
 			sw.WriteLine ($"XA_INSTALL_DIR=\"{Configurables.Paths.InstallMSBuildDir}/lib\"");
+			sw.WriteLine ($"LIBUNWIND_SOURCE_FULL_PATH=\"{context.Properties.GetRequiredValue(KnownProperties.LibUnwindSourceFullPath)}\"");
+			sw.WriteLine ($"LIBUNWIND_HEADERS_FULL_PATH=\"{context.Properties.GetRequiredValue(KnownProperties.LibUnwindGeneratedHeadersFullPath)}\"");
 			sw.WriteLine ();
 
 			string indent = "\t";
@@ -329,6 +333,8 @@ void GenerateMonodroidTargets (Context context, StreamWriter sw)
 				{ "@BUILD_TYPE@", "" },
 				{ "@CONFIGURATION@", "" },
 				{ "@SOURCE_DIRECTORY@", $"$(MSBuildThisFileDirectory){sourceDir}" },
+				{ "@LibUnwindSourceFullPath@", "$(LibUnwindSourceFullPath)" },
+				{ "@LibUnwindGeneratedHeadersFullPath@", "$(LibUnwindGeneratedHeadersFullPath)" },
 			};
 
 			var androidRuntimeReplacements = new Dictionary<string, string> (StringComparer.Ordinal) {
@@ -445,6 +451,8 @@ void GenerateMSBuildProps (Context context, StreamWriter sw)
 				{ "@AndroidNdkDirectory@", "$(AndroidNdkDirectory)" },
 				{ "@MonoSourceFullPath@", "$(MonoSourceFullPath)" },
 				{ "@AndroidToolchainPath@", GetRelativeToolchainDefinitionPath () },
+				{ "@LibUnwindSourceFullPath@", "$(LibUnwindSourceFullPath)" },
+				{ "@LibUnwindGeneratedHeadersFullPath@", "$(LibUnwindGeneratedHeadersFullPath)" },
 			};
 
 			var MSBuildMingwReplacements = new Dictionary<string, string> (StringComparer.Ordinal) {

build-tools/xaprepare/xaprepare/Application/KnownProperties.cs

@@ -39,6 +39,8 @@ static class KnownProperties
 		public const string JavaInteropFullPath                 = "JavaInteropFullPath";
 		public const string JavaSdkDirectory                    = "JavaSdkDirectory";
 		public const string JdkIncludePath                      = "JdkIncludePath";
+		public const string LibUnwindGeneratedHeadersFullPath   = nameof (LibUnwindGeneratedHeadersFullPath);
+		public const string LibUnwindSourceFullPath             = nameof (LibUnwindSourceFullPath);
 		public const string LibZipSourceFullPath                = "LibZipSourceFullPath";
 		public const string ManagedRuntime                      = "ManagedRuntime";
 		public const string MicrosoftAndroidSdkOutDir           = "MicrosoftAndroidSdkOutDir";

build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in

@@ -43,6 +43,8 @@ namespace Xamarin.Android.Prepare
 			properties.Add (KnownProperties.JavaInteropFullPath,                 StripQuotes (@"@JavaInteropFullPath@"));
 			properties.Add (KnownProperties.JavaSdkDirectory,                    StripQuotes (@"@JavaSdkDirectory@"));
 			properties.Add (KnownProperties.JdkIncludePath,                      StripQuotes (@"@JdkIncludePath@"));
+			properties.Add (KnownProperties.LibUnwindGeneratedHeadersFullPath,   StripQuotes (@"@LibUnwindGeneratedHeadersFullPath@"));
+			properties.Add (KnownProperties.LibUnwindSourceFullPath,             StripQuotes (@"@LibUnwindSourceFullPath"));
 			properties.Add (KnownProperties.LibZipSourceFullPath,                StripQuotes (@"@LibZipSourceFullPath@"));
 			properties.Add (KnownProperties.ManagedRuntime,                      StripQuotes (@"@ManagedRuntime@"));
 			properties.Add (KnownProperties.MicrosoftAndroidSdkOutDir,           StripQuotes (@"@MicrosoftAndroidSdkOutDir@"));

build-tools/xaprepare/xaprepare/ConfigAndData/CmakeBuilds.cs

@@ -35,15 +35,19 @@ public sealed class RuntimeCommand
 			"-GNinja",
 			"-DCMAKE_MAKE_PROGRAM=\"@NinjaPath@\"",
 			"-DXA_BUILD_CONFIGURATION=@XA_BUILD_CONFIGURATION@",
-			"-DXA_LIB_TOP_DIR=@XA_LIB_TOP_DIR@",
+			"-DXA_LIB_TOP_DIR=\"@XA_LIB_TOP_DIR@\"",
+			"-DLIBUNWIND_SOURCE_DIR=\"@LibUnwindSourceFullPath@\"",
+			"-DLIBUNWIND_HEADERS_DIR=\"@LibUnwindGeneratedHeadersFullPath@\"",
 		};
 
 		public static readonly List<string> AndroidFlags = new List<string> {
 			"-DANDROID_STL=\"none\"",
 			"-DANDROID_CPP_FEATURES=\"no-rtti no-exceptions\"",
 			"-DANDROID_TOOLCHAIN=clang",
 			"-DCMAKE_TOOLCHAIN_FILE=\"@AndroidNdkDirectory@@AndroidToolchainPath@\"",
-			"-DANDROID_NDK=@AndroidNdkDirectory@"
+			"-DANDROID_NDK=@AndroidNdkDirectory@",
+			"-DLIBUNWIND_SOURCE_DIR=\"@LibUnwindSourceFullPath@\"",
+			"-DLIBUNWIND_HEADERS_DIR=\"@LibUnwindGeneratedHeadersFullPath@\"",
 		};
 
 		public static readonly List<string> MonodroidCommonDefines = new List<string> {

build-tools/xaprepare/xaprepare/xaprepare.targets

@@ -76,6 +76,7 @@
       <Replacement Include="@JavaInteropFullPath@=$(JavaInteropFullPath)" />
       <Replacement Include="@JavaSdkDirectory@=$(JavaSdkDirectory)" />
       <Replacement Include="@JdkIncludePath@=$(JavaIncludePath)" />
+      <Replacement Include="@LibUnwindSourceFullPath@=$(LibUnwindSourceFullPath)" />
       <Replacement Include="@LibZipSourceFullPath@=$(LibZipSourceFullPath)" />
       <Replacement Include="@ManagedRuntime@=$(ManagedRuntime)" />
       <Replacement Include="@MicrosoftAndroidSdkOutDir@=$(MicrosoftAndroidSdkOutDir)" />

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

@@ -23,6 +23,7 @@ public class GeneratePackageManagerJava : AndroidTask
 		public override string TaskPrefix => "GPM";
 
 		Guid buildId = Guid.NewGuid ();
+		MarshalMethodsTracingMode mmTracingMode;
 
 		[Required]
 		public ITaskItem[] ResolvedAssemblies { get; set; }
@@ -66,6 +67,7 @@ public class GeneratePackageManagerJava : AndroidTask
 		public bool InstantRunEnabled { get; set; }
 
 		public bool EnableMarshalMethods { get; set; }
+		public string MarshalMethodsTracingMode { get; set; }
 		public string RuntimeConfigBinFilePath { get; set; }
 		public string BoundExceptionType { get; set; }
 
@@ -92,6 +94,8 @@ bool _Debug {
 
 		public override bool RunTask ()
 		{
+			mmTracingMode = MonoAndroidHelper.ParseMarshalMethodsTracingMode (MarshalMethodsTracingMode);
+
 			BuildId = buildId.ToString ();
 			Log.LogDebugMessage ("  [Output] BuildId: {0}", BuildId);
 
@@ -410,7 +414,8 @@ void AddEnvironment ()
 					assemblyCount,
 					uniqueAssemblyNames,
 					marshalMethodsState?.MarshalMethods,
-					Log
+					Log,
+					mmTracingMode
 				);
 			} else {
 				marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (assemblyCount, uniqueAssemblyNames);

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

@@ -29,6 +29,7 @@ sealed class InputFiles
 		{
 			public List<string> ObjectFiles;
 			public string OutputSharedLibrary;
+			public List<string> ExtraLibraries;
 		}
 
 		[Required]
@@ -43,8 +44,16 @@ sealed class InputFiles
 		[Required]
 		public string AndroidBinUtilsDirectory { get; set; }
 
+		public string MarshalMethodsTracingMode { get; set; }
+
+		MarshalMethodsTracingMode mmTracingMode;
+		bool mmTracingEnabled;
+
 		public override System.Threading.Tasks.Task RunTaskAsync ()
 		{
+			mmTracingMode = MonoAndroidHelper.ParseMarshalMethodsTracingMode (MarshalMethodsTracingMode);
+			mmTracingEnabled = mmTracingMode != Tasks.MarshalMethodsTracingMode.None;
+
 			return this.WhenAll (GetLinkerConfigs (), RunLinker);
 		}
 
@@ -112,27 +121,29 @@ void RunLinker (Config config)
 
 		IEnumerable<Config> GetLinkerConfigs ()
 		{
+			string runtimeNativeLibsDir = Path.GetFullPath (Path.Combine (AndroidBinUtilsDirectory, "..", "..", "..", "lib"));
+			string runtimeNativeLibStubsDir = Path.GetFullPath (Path.Combine (runtimeNativeLibsDir, "..", "libstubs"));
 			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, runtimeNativeLibStubsDir);
 			}
 
 			const string commonLinkerArgs =
-				"--unresolved-symbols=ignore-in-shared-libs " +
+				"--shared " +
+				"--allow-shlib-undefined " +
 				"--export-dynamic " +
 				"-soname libxamarin-app.so " +
 				"-z relro " +
 				"-z noexecstack " +
 				"--enable-new-dtags " +
 				"--eh-frame-hdr " +
-				"-shared " +
 				"--build-id " +
 				"--warn-shared-textrel " +
 				"--fatal-warnings";
 
-			string stripSymbolsArg = DebugBuild ? String.Empty : " -s";
+			string stripSymbolsArg = DebugBuild || mmTracingEnabled ? String.Empty : " -s";
 
 			string ld = Path.Combine (AndroidBinUtilsDirectory, MonoAndroidHelper.GetExecutablePath (AndroidBinUtilsDirectory, "ld"));
 			var targetLinkerArgs = new List<string> ();
@@ -177,6 +188,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 +203,33 @@ IEnumerable<Config> GetLinkerConfigs ()
 			}
 		}
 
-		InputFiles GatherFilesForABI (string runtimeSharedLibrary, string abi, ITaskItem[] objectFiles)
+		InputFiles GatherFilesForABI (string runtimeSharedLibrary, string abi, ITaskItem[] objectFiles, string runtimeNativeLibsDir, string runtimeNativeLibStubsDir)
 		{
+			List<string> extraLibraries = null;
+
+			if (mmTracingEnabled) {
+				string RID = MonoAndroidHelper.AbiToRid (abi);
+				AndroidTargetArch targetArch = MonoAndroidHelper.AbiToTargetArch (abi);
+				string clangLibraryAbi = MonoAndroidHelper.ArchToClangLibraryAbi (targetArch);
+				string builtinsLibName = $"libclang_rt.builtins-{clangLibraryAbi}-android.a";
+				string libStubsPath = Path.Combine (runtimeNativeLibStubsDir, RID);
+				string runtimeLibsDir = Path.Combine (runtimeNativeLibsDir, RID);
+
+				extraLibraries = new List<string> {
+					Path.Combine (runtimeLibsDir, "libmarshal-methods-tracing.a"),
+					Path.Combine (runtimeLibsDir, "libunwind_xamarin.a"),
+					Path.Combine (runtimeLibsDir, builtinsLibName),
+					$"-L \"{libStubsPath}\"",
+					"-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));