Cleaner suppressions for GetParameterMarshaler

dotnet · jonpryor · Feb 14, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
commit 9c7a05af6349f195b6c60a1150a156d53f8887e2
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
@@ -150,9 +150,14 @@ string GetTypeSignature (ParameterInfo p)
 				throw new NotSupportedException ("Don't know how to determine JNI signature for parameter type: " + p.ParameterType.FullName + ".");
 			}
 
-			[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "Method parameter types should be preserved via other means.")]
 			public JniValueMarshaler GetParameterMarshaler (ParameterInfo parameter)
 			{
+				// Activator.CreateInstance requires DynamicallyAccessedMemberTypes.PublicParameterlessConstructor
+				// GetValueMarshaler requires DynamicallyAccessedMemberTypes.Interfaces
+				[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = "JniValueMarshalerAttribute is decorated with [DynamicallyAccessedMembers]")]
+				static JniValueMarshaler GetValueMarshaler (JniValueManager manager, ParameterInfo parameter) =>
+					manager.GetValueMarshaler (parameter.ParameterType);
+
 				if (parameter.ParameterType == typeof (IntPtr))
 					return IntPtrValueMarshaler.Instance;
 
@@ -165,7 +170,7 @@ public JniValueMarshaler GetParameterMarshaler (ParameterInfo parameter)
 				if (attr != null) {
 					return (JniValueMarshaler) Activator.CreateInstance (attr.MarshalerType)!;
 				}
-				return Runtime.ValueManager.GetValueMarshaler (parameter.ParameterType);
+				return GetValueMarshaler (Runtime.ValueManager, parameter);
 			}
 
 			// Heuristic: if first two parameters are IntPtr, this is a "direct" wrapper.

diff --git a/src/Java.Interop/Java.Interop/JniValueMarshalerAttribute.cs b/src/Java.Interop/Java.Interop/JniValueMarshalerAttribute.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using System;
 using System.Diagnostics.CodeAnalysis;
@@ -8,13 +8,16 @@ namespace Java.Interop {
 
 	[AttributeUsage (Targets, AllowMultiple=false)]
 	public class JniValueMarshalerAttribute : Attribute {
+		const DynamicallyAccessedMemberTypes ParameterlessConstructorsInterfaces = DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.Interfaces;
 
 		const   AttributeTargets    Targets =
 			AttributeTargets.Class | AttributeTargets.Enum |
 			AttributeTargets.Interface | AttributeTargets.Struct |
 			AttributeTargets.Parameter | AttributeTargets.ReturnValue;
 
-		public JniValueMarshalerAttribute (Type marshalerType)
+		public JniValueMarshalerAttribute (
+				[DynamicallyAccessedMembers (ParameterlessConstructorsInterfaces)]
+				Type marshalerType)
 		{
 			if (marshalerType == null)
 				throw new ArgumentNullException (nameof (marshalerType));
@@ -27,7 +30,7 @@ public JniValueMarshalerAttribute (Type marshalerType)
 		}
 
 		public  Type    MarshalerType   {
-			[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
+			[return: DynamicallyAccessedMembers (ParameterlessConstructorsInterfaces)]
 			get;
 		}
 	}