Replace runtime trim suppressions

Surface untraceable runtime reflection with RUC and propagate DAM through native registration and peer activation paths.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: simonrozsival

src/Mono.Android/Android.Runtime/AndroidEnvironment.cs

@@ -254,18 +254,14 @@ static void DetectCPUAndArchitecture (out ushort builtForCPU, out ushort running
 		// System.Net.Http.dll!System.Net.Http.HttpClient.cctor
 		// DO NOT REMOVE
 		[DynamicDependency (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor, typeof (Xamarin.Android.Net.AndroidMessageHandler))]
+		[RequiresUnreferencedCode ("The HTTP handler type can be provided by an environment variable and cannot be statically traced.")]
 		static HttpMessageHandler GetHttpMessageHandler ()
 		{
-			[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Preserved by the MarkJavaObjects trimmer step.")]
-			[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-			static Type? TypeGetType (string typeName) =>
-				Type.GetType (typeName, throwOnError: false);
-
 			if (httpMessageHandlerType is null) {
 				var handlerTypeName = Environment.GetEnvironmentVariable ("XA_HTTP_CLIENT_HANDLER_TYPE")?.Trim ();
 				Type? handlerType = null;
 				if (!String.IsNullOrEmpty (handlerTypeName))
-					handlerType = TypeGetType (handlerTypeName);
+					handlerType = Type.GetType (handlerTypeName, throwOnError: false);
 
 				if (handlerType is null || !IsAcceptableHttpMessageHandlerType (handlerType)) {
 					handlerType = GetFallbackHttpMessageHandlerType ();

src/Mono.Android/Android.Runtime/AndroidRuntime.cs

@@ -461,15 +461,10 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 		static MethodInfo? dynamic_callback_gen;
 
 		// See ExportAttribute.cs
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "Mono.Android.Export.dll is preserved when [Export] is used via [DynamicDependency].")]
-		[UnconditionalSuppressMessage ("Trimming", "IL2075", Justification = "Mono.Android.Export.dll is preserved when [Export] is used via [DynamicDependency].")]
 		static Delegate CreateDynamicCallback (MethodInfo method)
 		{
 			if (dynamic_callback_gen == null) {
-				var assembly = Assembly.Load ("Mono.Android.Export");
-				if (assembly == null)
-					throw new InvalidOperationException ("To use methods marked with ExportAttribute, Mono.Android.Export.dll needs to be referenced in the application");
-				var type = assembly.GetType ("Java.Interop.DynamicCallbackCodeGenerator");
+				var type = Type.GetType ("Java.Interop.DynamicCallbackCodeGenerator, Mono.Android.Export", throwOnError: false);
 				if (type == null)
 					throw new InvalidOperationException ("The referenced Mono.Android.Export.dll does not match the expected version. The required type was not found.");
 				dynamic_callback_gen = type.GetMethod ("Create");
@@ -559,17 +554,14 @@ static bool CallRegisterMethodByIndex (JniNativeMethodRegistrationArguments argu
 		[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>) instead.")]
 		public override void RegisterNativeMembers (
 				JniType nativeClass,
-				[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
 				Type type,
 				string? methods) =>
 			RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
 
-		[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type.GetType() can never statically know the string value parsed from parameter 'methods'.")]
-		[UnconditionalSuppressMessage ("Trimming", "IL2067", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
-		[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
 		public override void RegisterNativeMembers (
 				JniType nativeClass,
-				[DynamicallyAccessedMembers (MethodsAndPrivateNested)] Type type,
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)] Type type,
 				ReadOnlySpan<char> methods)
 		{
 			try {
@@ -626,16 +618,11 @@ public override void RegisterNativeMembers (
 							}
 							needToRegisterNatives = true;
 						} else {
-							Type callbackDeclaringType = type;
 							if (!callbackDeclaringTypeString.IsEmpty) {
-								callbackDeclaringType = Type.GetType (callbackDeclaringTypeString.ToString (), throwOnError: true)!;
-							}
-							while (callbackDeclaringType.ContainsGenericParameters) {
-								callbackDeclaringType = callbackDeclaringType.BaseType!;
+								throw new NotSupportedException ("Callback declaring type names are not supported in trim-compatible native registration.");
 							}
 
-							GetCallbackHandler connector = (GetCallbackHandler) Delegate.CreateDelegate (typeof (GetCallbackHandler),
-							                                                                             callbackDeclaringType, callbackString.ToString ());
+							GetCallbackHandler connector = CreateCallbackHandler (type, callbackString.ToString ());
 							callback = connector ();
 						}
 
@@ -663,6 +650,17 @@ bool ShouldRegisterDynamically (string callbackTypeName, string callbackString,
 
 				return String.Compare (callbackName, callbackString, StringComparison.Ordinal) == 0;
 			}
+
+		}
+
+		static GetCallbackHandler CreateCallbackHandler (
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods)]
+				Type callbackDeclaringType,
+				string callbackString)
+		{
+			var method = callbackDeclaringType.GetMethod (callbackString, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static)
+				?? throw new MissingMethodException (callbackDeclaringType.FullName, callbackString);
+			return (GetCallbackHandler) Delegate.CreateDelegate (typeof (GetCallbackHandler), method);
 		}
 
 		static int CountMethods (ReadOnlySpan<char> methodsSpan)
@@ -908,7 +906,7 @@ internal void RemovePeer (IJavaPeerable value, IntPtr hash)
 			return null;
 		}
 
-		public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object? []? argumentValues)
+		public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] Type declaringType, ConstructorInfo cinfo, object? []? argumentValues)
 		{
 			Java.Interop.TypeManager.Activate (reference.Handle, cinfo, argumentValues);
 		}

src/Mono.Android/Android.Runtime/JNIEnvInit.cs

@@ -58,16 +58,11 @@ static void PropagateUncaughtException (IntPtr env, IntPtr javaThread, IntPtr ja
 		}
 
 		[UnmanagedCallersOnly]
+		[RequiresUnreferencedCode ("JNI native registration receives a managed type name from native code that cannot be statically traced.")]
 		static unsafe void RegisterJniNatives (IntPtr typeName_ptr, int typeName_len, IntPtr jniClass, IntPtr methods_ptr, int methods_len)
 		{
-			// FIXME: https://github.com/xamarin/xamarin-android/issues/8724
-			[UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type should be preserved by the MarkJavaObjects trimmer step.")]
-			[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
-			static Type TypeGetType (string typeName) =>
-				Type.GetType (typeName, throwOnError: false);
-
 			string typeName = new string ((char*) typeName_ptr, 0, typeName_len);
-			var type = TypeGetType (typeName);
+			var type = Type.GetType (typeName, throwOnError: false);
 			if (type == null) {
 				RuntimeNativeMethods.monodroid_log (LogLevel.Error,
 				               LogCategories.Default,

src/Mono.Android/Android.Runtime/JavaProxyThrowable.cs

@@ -39,15 +39,15 @@ public static JavaProxyThrowable Create (Exception innerException)
 			return proxy;
 		}
 
-		(int lineNumber, string? methodName, string? className) GetFrameInfo (StackFrame? managedFrame, MethodBase? managedMethod)
+		(int lineNumber, string? methodName, string? className) GetFrameInfo (StackFrame? managedFrame, DiagnosticMethodInfo? managedMethod)
 		{
 			string? methodName = null;
 			string? className = null;
 
 			if (managedFrame == null) {
 				if (managedMethod != null) {
 					methodName = managedMethod.Name;
-					className = managedMethod.DeclaringType?.FullName;
+					className = managedMethod.DeclaringTypeName;
 				}
 
 				return (-1, methodName, className);
@@ -69,7 +69,7 @@ public static JavaProxyThrowable Create (Exception innerException)
 					methodName = managedMethod.Name;
 				}
 
-				return (lineNumber, methodName, managedMethod.DeclaringType?.FullName);
+				return (lineNumber, methodName, managedMethod.DeclaringTypeName);
 			}
 
 			string frameString = managedFrame.ToString ();
@@ -120,10 +120,6 @@ void TranslateStackTrace ()
 			// StackFrame.GetMethod() will return null under NativeAOT;
 			// However, you can still get useful information from StackFrame.ToString():
 			// MainActivity.OnCreate() + 0x37 at offset 55 in file:line:column <filename unknown>:0:0
-			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "StackFrame.GetMethod() is \"best attempt\", we handle null & exceptions")]
-			static MethodBase? StackFrameGetMethod (StackFrame frame) =>
-				frame.GetMethod ();
-
 			var trace = new StackTrace (InnerException, fNeedFileInfo: true);
 			if (trace.FrameCount <= 0) {
 				return;
@@ -145,7 +141,7 @@ void TranslateStackTrace ()
 			const string Unknown = "Unknown";
 			for (int i = 0; i < frames.Length; i++) {
 				StackFrame managedFrame = frames[i];
-				MethodBase? managedMethod = StackFrameGetMethod (managedFrame);
+				DiagnosticMethodInfo? managedMethod = DiagnosticMethodInfo.Create (managedFrame);
 
 				// https://developer.android.com/reference/java/lang/StackTraceElement?hl=en#StackTraceElement(java.lang.String,%20java.lang.String,%20java.lang.String,%20int)
 				(int lineNumber, string? methodName, string? declaringClass) = GetFrameInfo (managedFrame, managedMethod);

src/Mono.Android/Android.Runtime/ResourceIdManager.cs

@@ -7,6 +7,7 @@ namespace Android.Runtime
 	public static class ResourceIdManager
 	{
 		static bool id_initialized;
+		[RequiresUnreferencedCode ("Resource designer lookup uses a type name from ResourceDesignerAttribute that cannot be statically traced.")]
 		public static void UpdateIdValues ()
 		{
 			if (id_initialized)
@@ -31,13 +32,10 @@ public static void UpdateIdValues ()
 			}
 		}
 
+		[RequiresUnreferencedCode ("Resource designer lookup uses a type name from ResourceDesignerAttribute that cannot be statically traced.")]
 		[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
 		static Type? GetResourceTypeFromAssembly (Assembly assembly)
 		{
-			const string rootAssembly = "Resources.UpdateIdValues() methods are trimmed away by the LinkResourceDesigner trimmer step. This codepath is not called unless $(AndroidUseDesignerAssembly) is disabled.";
-
-			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = rootAssembly)]
-			[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = rootAssembly)]
 			[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
 			static Type AssemblyGetType (Assembly a, string name) => a.GetType (name);
 
@@ -52,4 +50,3 @@ public static void UpdateIdValues ()
 		}
 	}
 }
-

src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs

@@ -71,7 +71,7 @@ public unsafe override void CollectPeers ()
 		while (CollectedContexts.TryDequeue (out IntPtr contextPtr)) {
 			Debug.Assert (contextPtr != IntPtr.Zero, "CollectedContexts should not contain null pointers.");
 			HandleContext* context = (HandleContext*)contextPtr;
-			
+
 			lock (RegisteredInstances) {
 				Remove (context);
 			}
@@ -249,10 +249,10 @@ public override void FinalizePeer (IJavaPeerable value)
 		value.Finalized ();
 	}
 
-	public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+	public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, [DynamicallyAccessedMembers (Constructors)] Type declaringType, ConstructorInfo cinfo, object?[]? argumentValues)
 	{
 		try {
-			ActivateViaReflection (reference, cinfo, argumentValues);
+			ActivateViaReflection (reference, declaringType, cinfo, argumentValues);
 		} catch (Exception e) {
 			var m = string.Format (
 					CultureInfo.InvariantCulture,
@@ -267,21 +267,15 @@ public override void ActivatePeer (IJavaPeerable? self, JniObjectReference refer
 		}
 	}
 
-	void ActivateViaReflection (JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+	void ActivateViaReflection (
+		JniObjectReference reference,
+		[DynamicallyAccessedMembers (Constructors)] Type declaringType,
+		ConstructorInfo cinfo,
+		object?[]? argumentValues)
 	{
-		var declType  = GetDeclaringType (cinfo);
-
-#pragma warning disable IL2072
-		var self      = (IJavaPeerable) System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject (declType);
-#pragma warning restore IL2072
+		var self      = (IJavaPeerable) System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject (declaringType);
 		self.SetPeerReference (reference);
-
 		cinfo.Invoke (self, argumentValues);
-
-		[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = "🤷‍♂️")]
-		[return: DynamicallyAccessedMembers (Constructors)]
-		Type GetDeclaringType (ConstructorInfo cinfo) =>
-			cinfo.DeclaringType ?? throw new NotSupportedException ("Do not know the type to create!");
 	}
 
 	public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
@@ -402,7 +396,7 @@ static void EnsureContextIsOurs (IntPtr context)
 				if (!referenceTrackingHandles.ContainsKey (context)) {
 					throw new InvalidOperationException ("Unknown reference tracking handle.");
 				}
-			}	
+			}
 		}
 
 		public static HandleContext* Alloc (IJavaPeerable peer)

src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs

@@ -65,7 +65,7 @@ static Type MakeGenericType (
 	[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
 	public override void RegisterNativeMembers (
 			JniType nativeClass,
-			[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
+			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
 			Type type,
 			ReadOnlySpan<char> methods)
 	{

src/Mono.Android/Microsoft.Android.Runtime/SimpleValueManager.cs

@@ -207,10 +207,10 @@ public override void FinalizePeer (IJavaPeerable value)
 		value.Finalized ();
 	}
 
-	public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+	public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, [DynamicallyAccessedMembers (Constructors)] Type declaringType, ConstructorInfo cinfo, object?[]? argumentValues)
 	{
 		try {
-			ActivateViaReflection (reference, cinfo, argumentValues);
+			ActivateViaReflection (reference, declaringType, cinfo, argumentValues);
 		} catch (Exception e) {
 			var m = string.Format (
 					CultureInfo.InvariantCulture,
@@ -225,21 +225,12 @@ public override void ActivatePeer (IJavaPeerable? self, JniObjectReference refer
 		}
 	}
 
-	void ActivateViaReflection (JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
+	void ActivateViaReflection (JniObjectReference reference, [DynamicallyAccessedMembers (Constructors)] Type declaringType, ConstructorInfo cinfo, object?[]? argumentValues)
 	{
-		var declType  = GetDeclaringType (cinfo);
-
-#pragma warning disable IL2072
-		var self      = (IJavaPeerable) System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject (declType);
-#pragma warning restore IL2072
+		var self      = (IJavaPeerable) System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject (declaringType);
 		self.SetPeerReference (reference);
 
 		cinfo.Invoke (self, argumentValues);
-
-		[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = "🤷‍♂️")]
-		[return: DynamicallyAccessedMembers (Constructors)]
-		Type GetDeclaringType (ConstructorInfo cinfo) =>
-			cinfo.DeclaringType ?? throw new NotSupportedException ("Do not know the type to create!");
 	}
 
 	public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()

src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs

@@ -107,7 +107,7 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 
 	public override void RegisterNativeMembers (
 			JniType nativeClass,
-			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
+			[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
 			Type type,
 			ReadOnlySpan<char> methods)
 	{