Merge branch 'main' into dev/grendel/blobs-in-lib

grendello · grendello · commit e4395109e819 · 2024-03-01T22:40:56.000+01:00
* main: [Mono.Android] fix trimming warnings, part 2 (#8758)
diff --git a/src/Mono.Android/Android.App/Activity.cs b/src/Mono.Android/Android.App/Activity.cs
@@ -1,19 +1,27 @@
 using System;
-
+using System.Diagnostics.CodeAnalysis;
 using Android.Runtime;
 
 namespace Android.App {
 
 	partial class Activity {
 
-		public T? FindViewById<T> (int id)
+		internal const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
+
+		public T? FindViewById<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (int id)
 			where T : Android.Views.View
 		{
 			return this.FindViewById (id)!.JavaCast<T> ();
 		}
 
 		// See: https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/app/Activity.java;l=3430
-		public T RequireViewById<T> (int id)
+		public T RequireViewById<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (int id)
 			where T : Android.Views.View
 		{
 			var view = FindViewById<T> (id);
diff --git a/src/Mono.Android/Android.App/Dialog.cs b/src/Mono.Android/Android.App/Dialog.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Android.Runtime;
 
 namespace Android.App {
@@ -8,7 +9,10 @@ public partial class Dialog {
 		protected Dialog (Android.Content.Context context, bool cancelable, EventHandler cancelHandler) 
 			: this (context, cancelable, new Android.Content.IDialogInterfaceOnCancelListenerImplementor () { Handler = cancelHandler }) {}
 
-		public T? FindViewById<T> (int id)
+		public T? FindViewById<
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+				T
+		> (int id)
 			where T : Android.Views.View
 		{
 			return this.FindViewById (id).JavaCast<T> ();
diff --git a/src/Mono.Android/Android.App/FragmentManager.cs b/src/Mono.Android/Android.App/FragmentManager.cs
@@ -1,18 +1,35 @@
 using Android.OS;
 using Android.Runtime;
+using System.Diagnostics.CodeAnalysis;
 
 #if ANDROID_11
 namespace Android.App {
 	public partial class FragmentManager {
-		public T? FindFragmentById<T> (int id) where T : Fragment
+		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
+
+		public T? FindFragmentById<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (int id)
+			where T : Fragment
 		{
 			return FindFragmentById (id).JavaCast<T> ();
 		}
-		public T? FindFragmentByTag<T> (string tag) where T : Fragment
+
+		public T? FindFragmentByTag<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (string tag)
+			where T : Fragment
 		{
 			return FindFragmentByTag (tag).JavaCast<T> ();
 		}
-		public T? GetFragment<T> (Bundle bundle, string key) where T : Fragment
+
+		public T? GetFragment<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (Bundle bundle, string key)
+			where T : Fragment
 		{
 			return GetFragment (bundle, key).JavaCast<T> ();
 		}
diff --git a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
@@ -247,6 +247,9 @@ struct JniRemappingReplacementMethod
 
 		bool jniAddNativeMethodRegistrationAttributePresent;
 
+		const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
+		const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;
+
 		public AndroidTypeManager (bool jniAddNativeMethodRegistrationAttributePresent)
 		{
 			this.jniAddNativeMethodRegistrationAttributePresent = jniAddNativeMethodRegistrationAttributePresent;
@@ -473,7 +476,7 @@ static bool CallRegisterMethodByIndex (JniNativeMethodRegistrationArguments argu
 
 		public override void RegisterNativeMembers (
 				JniType nativeClass,
-				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)]
+				[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
 				Type type,
 				string? methods) =>
 			RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
@@ -483,7 +486,7 @@ public override void RegisterNativeMembers (
 		[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Delegate.CreateDelegate() can never statically know the string value parsed from parameter 'methods'.")]
 		public void RegisterNativeMembers (
 				JniType nativeClass,
-				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type type,
+				[DynamicallyAccessedMembers (MethodsAndPrivateNested)] Type type,
 				ReadOnlySpan<char> methods)
 		{
 			try {
@@ -619,7 +622,11 @@ public override void WaitForGCBridgeProcessing ()
 			AndroidRuntimeInternal.WaitForBridgeProcessing ();
 		}
 
-		public override IJavaPeerable? CreatePeer (ref JniObjectReference reference, JniObjectReferenceOptions options, Type? targetType)
+		public override IJavaPeerable? CreatePeer (
+				ref JniObjectReference reference,
+				JniObjectReferenceOptions options,
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+				Type? targetType)
 		{
 			if (!reference.IsValid)
 				return null;
diff --git a/src/Mono.Android/Android.Runtime/Extensions.cs b/src/Mono.Android/Android.Runtime/Extensions.cs
@@ -7,7 +7,10 @@ namespace Android.Runtime {
 	public static class Extensions {
 
 		[return: NotNullIfNotNull ("instance")]
-		public static TResult? JavaCast<TResult> (this IJavaObject? instance)
+		public static TResult? JavaCast<
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+				TResult
+		> (this IJavaObject? instance)
 			where TResult : class, IJavaObject
 		{
 			return Java.Interop.JavaObjectExtensions.JavaCast<TResult>(instance);
diff --git a/src/Mono.Android/Android.Runtime/JNINativeWrapper.cs b/src/Mono.Android/Android.Runtime/JNINativeWrapper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Threading;
@@ -52,7 +53,11 @@ public static Delegate CreateDelegate (Delegate dlg)
 				param_types [i] = parameters [i].ParameterType;
 			}
 
+			// FIXME: https://github.com/xamarin/xamarin-android/issues/8724
+			// IL3050 disabled in source: if someone uses NativeAOT, they will get the warning.
+			#pragma warning disable IL3050
 			var dynamic = new DynamicMethod (DynamicMethodNameCounter.GetUniqueName (), ret_type, param_types, typeof (DynamicMethodNameCounter), true);
+			#pragma warning restore IL3050
 			var ig = dynamic.GetILGenerator ();
 
 			LocalBuilder? retval = null;
diff --git a/src/Mono.Android/Android.Runtime/JavaProxyThrowable.cs b/src/Mono.Android/Android.Runtime/JavaProxyThrowable.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 using StackTraceElement = Java.Lang.StackTraceElement;
@@ -38,6 +39,14 @@ public static JavaProxyThrowable Create (Exception innerException)
 
 		void TranslateStackTrace ()
 		{
+			// FIXME: https://github.com/xamarin/xamarin-android/issues/8724
+			// 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;
@@ -59,7 +68,7 @@ void TranslateStackTrace ()
 
 			for (int i = 0; i < frames.Length; i++) {
 				StackFrame managedFrame = frames[i];
-				MethodBase? managedMethod = managedFrame.GetMethod ();
+				MethodBase? managedMethod = StackFrameGetMethod (managedFrame);
 
 				var throwableFrame = new StackTraceElement (
 					declaringClass: managedMethod?.DeclaringType?.FullName,
diff --git a/src/Mono.Android/Android.Runtime/ResourceDesignerAttribute.cs b/src/Mono.Android/Android.Runtime/ResourceDesignerAttribute.cs
@@ -1,15 +1,19 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Android.Runtime
 {
 	[AttributeUsage (AttributeTargets.Assembly)]
 	public class ResourceDesignerAttribute : Attribute
 	{
-		public ResourceDesignerAttribute (string fullName)
+		public ResourceDesignerAttribute (
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+				string fullName)
 		{
 			FullName = fullName;
 		}
 
+		[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
 		public string FullName { get; set; }
 
 		public bool IsApplication { get; set; }
diff --git a/src/Mono.Android/Android.Runtime/ResourceIdManager.cs b/src/Mono.Android/Android.Runtime/ResourceIdManager.cs
@@ -31,12 +31,19 @@ public static void UpdateIdValues ()
 			}
 		}
 
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "Types in Resource.designer.cs are preserved, because it is the root assembly passed to the linker.")]
+		[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);
+
 			foreach (var customAttribute in assembly.GetCustomAttributes (typeof (ResourceDesignerAttribute), true)) {
 				if (customAttribute is ResourceDesignerAttribute resourceDesignerAttribute && resourceDesignerAttribute.IsApplication) {
-					var type = assembly.GetType (resourceDesignerAttribute.FullName);
+					var type = AssemblyGetType (assembly, resourceDesignerAttribute.FullName);
 					if (type != null)
 						return type;
 				}
diff --git a/src/Mono.Android/Android.Views/View.cs b/src/Mono.Android/Android.Views/View.cs
@@ -14,6 +14,8 @@ public enum SystemUiFlags {
 
 	public partial class View {
 
+		internal const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
+
 #if ANDROID_16
 		[Obsolete ("This method uses wrong enum type. Please use PerformAccessibilityAction(Action) instead.")]
 		public bool PerformAccessibilityAction (GlobalAction action, Bundle arguments)
@@ -22,14 +24,20 @@ public bool PerformAccessibilityAction (GlobalAction action, Bundle arguments)
 		}
 #endif
 
-		public T? FindViewById<T> (int id)
+		public T? FindViewById<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (int id)
 			where T : Android.Views.View
 		{
 			return this.FindViewById (id).JavaCast<T> ();
 		}
 
 		// See: https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/view/View.java;l=25322
-		public T RequireViewById<T> (int id)
+		public T RequireViewById<
+				[DynamicallyAccessedMembers (Constructors)]
+				T
+		> (int id)
 			where T : Android.Views.View
 		{
 			var view = FindViewById<T> (id);
diff --git a/src/Mono.Android/Android.Views/Window.cs b/src/Mono.Android/Android.Views/Window.cs
@@ -6,7 +6,10 @@ namespace Android.Views {
 
 	partial class Window {
 
-		public T? FindViewById<T> (int id)
+		public T? FindViewById<
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
+				T
+		> (int id)
 			where T : Android.Views.View
 		{
 			return this.FindViewById (id).JavaCast<T> ();
diff --git a/src/Mono.Android/Java.Interop/JavaObjectExtensions.cs b/src/Mono.Android/Java.Interop/JavaObjectExtensions.cs
@@ -8,6 +8,7 @@
 namespace Java.Interop {
 
 	public static class JavaObjectExtensions {
+		const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
 
 		[Obsolete ("Use Android.Runtime.JavaCollection.ToLocalJniHandle()")]
 		public static JavaCollection ToInteroperableCollection (this ICollection instance)
@@ -46,13 +47,19 @@ public static JavaDictionary<K,V> ToInteroperableCollection<K,V> (this IDictiona
 		}
 
 		[return: NotNullIfNotNull ("instance")]
-		public static TResult? JavaCast<TResult> (this IJavaObject? instance)
+		public static TResult? JavaCast<
+				[DynamicallyAccessedMembers (Constructors)]
+				TResult
+		> (this IJavaObject? instance)
 			where TResult : class, IJavaObject
 		{
 			return _JavaCast<TResult> (instance);
 		}
 
-		internal static TResult? _JavaCast<TResult> (this IJavaObject? instance)
+		internal static TResult? _JavaCast<
+				[DynamicallyAccessedMembers (Constructors)]
+				TResult
+		> (this IJavaObject? instance)
 		{
 			if (instance == null)
 				return default (TResult);
@@ -74,7 +81,10 @@ public static JavaDictionary<K,V> ToInteroperableCollection<K,V> (this IDictiona
 				throw new NotSupportedException (FormattableString.Invariant ($"Unable to convert type '{instance.GetType ().FullName}' to '{resultType.FullName}'."));
 		}
 
-		static IJavaObject CastClass (IJavaObject instance, Type resultType)
+		static IJavaObject CastClass (
+				IJavaObject instance,
+				[DynamicallyAccessedMembers (Constructors)]
+				Type resultType)
 		{
 			var klass = JNIEnv.FindClass (resultType);
 			try {
@@ -97,7 +107,10 @@ static IJavaObject CastClass (IJavaObject instance, Type resultType)
 			return (IJavaObject) TypeManager.CreateProxy (resultType, instance.Handle, JniHandleOwnership.DoNotTransfer);
 		}
 
-		internal static IJavaObject? JavaCast (IJavaObject? instance, Type resultType)
+		internal static IJavaObject? JavaCast (
+				IJavaObject? instance,
+				[DynamicallyAccessedMembers (Constructors)]
+				Type resultType)
 		{
 			if (resultType == null)
 				throw new ArgumentNullException ("resultType");
@@ -120,23 +133,43 @@ static IJavaObject CastClass (IJavaObject instance, Type resultType)
 
 		// typeof(Foo) -> FooInvoker
 		// typeof(Foo<>) -> FooInvoker`1
-		[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "*Invoker types are preserved by the MarkJavaObjects linker step.")]
-		[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = "*Invoker types are preserved by the MarkJavaObjects linker step.")]
+		[return: DynamicallyAccessedMembers (Constructors)]
 		internal static Type? GetInvokerType (Type type)
 		{
+			const string InvokerTypes = "*Invoker types are preserved by the MarkJavaObjects linker step.";
+
+			[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = InvokerTypes)]
+			[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = InvokerTypes)]
+			[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = InvokerTypes)]
+			[return: DynamicallyAccessedMembers (Constructors)]
+			static Type? AssemblyGetType (Assembly assembly, string typeName) =>
+				assembly.GetType (typeName);
+
+			// FIXME: https://github.com/xamarin/xamarin-android/issues/8724
+			// IL3050 disabled in source: if someone uses NativeAOT, they will get the warning.
+			[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = InvokerTypes)]
+			[UnconditionalSuppressMessage ("Trimming", "IL2068", Justification = InvokerTypes)]
+			[return: DynamicallyAccessedMembers (Constructors)]
+			static Type MakeGenericType (Type type, params Type [] typeArguments) =>
+				#pragma warning disable IL3050
+				type.MakeGenericType (typeArguments);
+				#pragma warning restore IL3050
+
 			const string suffix = "Invoker";
+			
 			Type[] arguments = type.GetGenericArguments ();
 			if (arguments.Length == 0)
-				return type.Assembly.GetType (type + suffix);
+				return AssemblyGetType (type.Assembly, type + suffix);
 			Type definition = type.GetGenericTypeDefinition ();
 			int bt = definition.FullName!.IndexOf ("`", StringComparison.Ordinal);
 			if (bt == -1)
 				throw new NotSupportedException ("Generic type doesn't follow generic type naming convention! " + type.FullName);
-			Type? suffixDefinition = definition.Assembly.GetType (
+			Type? suffixDefinition = AssemblyGetType (
+					definition.Assembly,
 					definition.FullName.Substring (0, bt) + suffix + definition.FullName.Substring (bt));
 			if (suffixDefinition == null)
 				return null;
-			return suffixDefinition.MakeGenericType (arguments);
+			return MakeGenericType (suffixDefinition, arguments);
 		}
 	}
 }
diff --git a/src/Mono.Android/Java.Interop/TypeManager.cs b/src/Mono.Android/Java.Interop/TypeManager.cs

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,19 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Diagnostics.CodeAnalysis;`
`2`	`3`
`3`	`4`	`namespace Android.Runtime`
`4`	`5`	`{`
`5`	`6`	`[AttributeUsage (AttributeTargets.Assembly)]`
`6`	`7`	`public class ResourceDesignerAttribute : Attribute`
`7`	`8`	`{`
`8`		`- public ResourceDesignerAttribute (string fullName)`
	`9`	`+ public ResourceDesignerAttribute (`
	`10`	`+ [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]`
	`11`	`+ string fullName)`
`9`	`12`	`{`
`10`	`13`	`FullName = fullName;`
`11`	`14`	`}`
`12`	`15`
	`16`	`+ [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]`
`13`	`17`	`public string FullName { get; set; }`
`14`	`18`
`15`	`19`	`public bool IsApplication { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,19 @@ public static void UpdateIdValues ()`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- [UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "Types in Resource.designer.cs are preserved, because it is the root assembly passed to the linker.")]`
	`34`	`+ [return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]`
`35`	`35`	`static Type? GetResourceTypeFromAssembly (Assembly assembly)`
`36`	`36`	`{`
	`37`	`+ const string rootAssembly = "Resources.UpdateIdValues() methods are trimmed away by the LinkResourceDesigner trimmer step. This codepath is not called unless $(AndroidUseDesignerAssembly) is disabled.";`
	`38`	`+`
	`39`	`+ [UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = rootAssembly)]`
	`40`	`+ [UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = rootAssembly)]`
	`41`	`+ [return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]`
	`42`	`+ static Type AssemblyGetType (Assembly a, string name) => a.GetType (name);`
	`43`	`+`
`37`	`44`	`foreach (var customAttribute in assembly.GetCustomAttributes (typeof (ResourceDesignerAttribute), true)) {`
`38`	`45`	`if (customAttribute is ResourceDesignerAttribute resourceDesignerAttribute && resourceDesignerAttribute.IsApplication) {`
`39`		`- var type = assembly.GetType (resourceDesignerAttribute.FullName);`
	`46`	`+ var type = AssemblyGetType (assembly, resourceDesignerAttribute.FullName);`
`40`	`47`	`if (type != null)`
`41`	`48`	`return type;`
`42`	`49`	`}`