Skip to content

Remove trim and AOT warning suppressions #1416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
simonrozsival wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Remove trim and AOT warning suppressions #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e67049b
Model peer activation for trimming
simonrozsival May 1, 2026
a7a04b1
Enable Java.Interop trim analyzers
simonrozsival May 1, 2026
43bb790
Remove Java.Interop trim suppressions
simonrozsival May 1, 2026
f7a6836
Remove unused trim diagnostic message
simonrozsival May 1, 2026
6ba9f3f
Model JNI type lookup for trimming
simonrozsival May 1, 2026
e2b3282
Inline JNI type construction helpers
simonrozsival May 1, 2026
30ea2d5
Restore Java.Interop marshaling behavior
simonrozsival May 1, 2026
7ad819b
Annotate Java.Interop dynamic lookup
simonrozsival May 2, 2026
1bdd03f
Use typed JNIEnv array marshaling
simonrozsival May 2, 2026
c9939e1
Revert broad JniTypeSignature generation
simonrozsival May 2, 2026
d71cca5
Enable AOT analyzers for shipped Java libraries
simonrozsival May 2, 2026
527f0b3
Remove Java runtime trim suppressions
simonrozsival May 2, 2026
b276451
Annotate generated type registrations
simonrozsival May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Java.Base/Java.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<IsAotCompatible>true</IsAotCompatible>
<NoWarn>$(NoWarn);8764;0109;0114</NoWarn>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions src/Java.Interop/Java.Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<IsAotCompatible>true</IsAotCompatible>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
</PropertyGroup>
Expand Down
146 changes: 106 additions & 40 deletions src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public override string ToString ()
public partial class JniTypeManager : IDisposable, ISetRuntime {

internal const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
internal const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
internal const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.AllMethods;
internal const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;
internal const DynamicallyAccessedMemberTypes MethodsConstructors = MethodsAndPrivateNested | DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;

Expand Down Expand Up @@ -261,28 +261,35 @@ protected virtual IEnumerable<string> GetSimpleReferences (Type type)

static readonly string[] EmptyStringArray = Array.Empty<string> ();
static readonly Type[] EmptyTypeArray = Array.Empty<Type> ();
const string NotUsedInAndroid = "This code path is not used in Android projects.";

// FIXME: https://github.com/dotnet/java-interop/issues/1192
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = NotUsedInAndroid)]
static Type MakeArrayType (Type type) =>
type.MakeArrayType ();
[return: DynamicallyAccessedMembers (Constructors)]
public virtual Type? GetType (JniTypeSignature typeSignature)
{
AssertValid ();

// FIXME: https://github.com/dotnet/java-interop/issues/1192
[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = NotUsedInAndroid)]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = NotUsedInAndroid)]
static Type MakeGenericType (Type type, Type arrayType) =>
type.MakeGenericType (arrayType);
if (!typeSignature.IsValid || typeSignature.SimpleReference == null || typeSignature.ArrayRank != 0)
return null;

[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = "Types returned here should be preserved via other means.")]
[return: DynamicallyAccessedMembers (MethodsConstructors)]
public Type? GetType (JniTypeSignature typeSignature)
return GetBuiltInTypeForSimpleReference (typeSignature.SimpleReference);
Comment on lines +265 to +273
Copy link
Copy Markdown

@github-actions github-actions Bot May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Behavioral change: GetType was previously non-virtual and delegated to GetTypes().FirstOrDefault(), which walked through the overridable GetTypesForSimpleReference pipeline (including array rank handling, generic wrapping, etc.).

Now GetType is virtual and only checks GetBuiltInTypeForSimpleReference — it explicitly rejects array types (typeSignature.ArrayRank != 0).

This is a significant behavioral split:

  • Before: GetType(new JniTypeSignature("java/lang/String", arrayRank: 1)) would return a JavaObjectArray<string> via the GetTypes pipeline.
  • After: The same call returns null from the base implementation.

This seems intentional (the base now requires ArrayRank == 0), and subclass overrides in JreTypeManager and tests also enforce this. Just confirming this narrowing is deliberate. Callers relying on GetType for array types must now use GetTypes instead.

}

[return: DynamicallyAccessedMembers (Constructors)]
public virtual Type? GetTypeAssignableTo (
JniTypeSignature typeSignature,
[DynamicallyAccessedMembers (Constructors)]
Type targetType)
{
AssertValid ();

return GetTypes (typeSignature).FirstOrDefault ();
var type = GetType (typeSignature);
if (type != null && targetType.IsAssignableFrom (type)) {
return type;
}
return null;
}

[RequiresDynamicCode ("JNI type lookup may need to construct array or generic wrapper types dynamically.")]
[RequiresUnreferencedCode ("JNI type lookup may need to construct array or generic wrapper types dynamically.")]
public virtual IEnumerable<Type> GetTypes (JniTypeSignature typeSignature)
{
AssertValid ();
Expand All @@ -292,6 +299,8 @@ public virtual IEnumerable<Type> GetTypes (JniTypeSignature typeSignature)
return CreateGetTypesEnumerator (typeSignature);
}

[RequiresDynamicCode ("JNI type lookup may need to construct array or generic wrapper types dynamically.")]
[RequiresUnreferencedCode ("JNI type lookup may need to construct array or generic wrapper types dynamically.")]
IEnumerable<Type> CreateGetTypesEnumerator (JniTypeSignature typeSignature)
{
if (!typeSignature.IsValid)
Expand All @@ -313,7 +322,7 @@ IEnumerable<Type> CreateGetTypesEnumerator (JniTypeSignature typeSignature)
var rank = typeSignature.ArrayRank;
var arrayType = type;
while (rank-- > 0) {
arrayType = MakeGenericType (typeof (JavaObjectArray<>), arrayType);
arrayType = typeof (JavaObjectArray<>).MakeGenericType (arrayType);
}
yield return arrayType;
}
Expand All @@ -322,13 +331,15 @@ IEnumerable<Type> CreateGetTypesEnumerator (JniTypeSignature typeSignature)
var rank = typeSignature.ArrayRank;
var arrayType = type;
while (rank-- > 0) {
arrayType = MakeArrayType (arrayType);
arrayType = arrayType.MakeArrayType ();
}
yield return arrayType;
}
}
}

[RequiresDynamicCode ("JNI type lookup may need to construct array or generic wrapper types dynamically.")]
[RequiresUnreferencedCode ("JNI type lookup may need to construct array or generic wrapper types dynamically.")]
IEnumerable<Type> GetPrimitiveArrayTypesForSimpleReference (JniTypeSignature typeSignature, Type type)
{
int index = -1;
Expand All @@ -345,14 +356,14 @@ IEnumerable<Type> GetPrimitiveArrayTypesForSimpleReference (JniTypeSignature typ
var rank = typeSignature.ArrayRank-1;
var arrayType = t;
while (rank-- > 0) {
arrayType = MakeGenericType (typeof (JavaObjectArray<>), arrayType);
arrayType = typeof (JavaObjectArray<>).MakeGenericType (arrayType);
}
yield return arrayType;

rank = typeSignature.ArrayRank-1;
arrayType = t;
while (rank-- > 0) {
arrayType = MakeArrayType (arrayType);
arrayType = arrayType.MakeArrayType ();
}
yield return arrayType;
}
Expand All @@ -369,14 +380,54 @@ protected virtual IEnumerable<Type> GetTypesForSimpleReference (string jniSimple

IEnumerable<Type> CreateGetTypesForSimpleReferenceEnumerator (string jniSimpleReference)
{
if (JniBuiltinSimpleReferenceToType.Value.TryGetValue (jniSimpleReference, out var ret)) {
var ret = GetBuiltInTypeForSimpleReference (jniSimpleReference);
if (ret != null) {
yield return ret;
}
yield break;
}

[return: DynamicallyAccessedMembers (Constructors)]
static Type? GetBuiltInTypeForSimpleReference (string jniSimpleReference)
{
return jniSimpleReference switch {
"java/lang/String" => typeof (string),
"net/dot/jni/internal/JavaProxyObject" => typeof (JavaProxyObject),
"net/dot/jni/internal/JavaProxyThrowable" => typeof (JavaProxyThrowable),
"net/dot/jni/ManagedPeer" => typeof (ManagedPeer),
"V" => typeof (void),
"Z" => typeof (Boolean),
"java/lang/Boolean" => typeof (Boolean?),
"B" => typeof (SByte),
"java/lang/Byte" => typeof (SByte?),
"C" => typeof (Char),
"java/lang/Character" => typeof (Char?),
"S" => typeof (Int16),
"java/lang/Short" => typeof (Int16?),
"I" => typeof (Int32),
"java/lang/Integer" => typeof (Int32?),
"J" => typeof (Int64),
"java/lang/Long" => typeof (Int64?),
"F" => typeof (Single),
"java/lang/Float" => typeof (Single?),
"D" => typeof (Double),
"java/lang/Double" => typeof (Double?),
_ => null,
};
}

[return: DynamicallyAccessedMembers (MethodsConstructors)]
public virtual Type? GetTypeForNativeRegistration (JniTypeSignature typeSignature)
{
AssertValid ();

return null;
}
Comment on lines +419 to +425
Copy link
Copy Markdown

@github-actions github-actions Bot May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The [return: DynamicallyAccessedMembers(MethodsConstructors)] annotation on GetTypeForNativeRegistration is a promise to callers. However, the base implementation returns null, and overrides (like JreTypeManager) return types from a Dictionary<string, Type> where the Type values have no DAM annotations.

This means the trimmer will trust the [return: DAM] annotation and assume the returned type's constructors/methods/nested types are preserved — but they might not be, since the types were put into typeMappings without any DAM contract on the dictionary's Type values.

This is a known limitation of DAM annotations on dictionary-stored types and may be fine if the caller (dotnet/android) guarantees these types are preserved by linker steps, but it's worth documenting as a contract requirement on JreRuntimeOptions.TypeMappings.


/// <include file="../Documentation/Java.Interop/JniRuntime.JniTypeManager.xml" path="/docs/member[@name='M:GetInvokerType']/*" />
[return: DynamicallyAccessedMembers (Constructors)]
[RequiresDynamicCode ("Generic invoker type construction may require runtime generic code generation.")]
[RequiresUnreferencedCode ("Generic invoker type construction may require unreferenced generic parameter annotations.")]
public Type? GetInvokerType (
[DynamicallyAccessedMembers (Constructors)]
Type type)
Expand All @@ -388,23 +439,41 @@ IEnumerable<Type> CreateGetTypesForSimpleReferenceEnumerator (string jniSimpleRe
}

[return: DynamicallyAccessedMembers (Constructors)]
internal Type? GetInvokerTypeForPeerCreation (
[DynamicallyAccessedMembers (Constructors)]
Type type)
{
if (type.IsAbstract || type.IsInterface) {
return GetInvokerTypeForPeerCreationCore (type);
}
return null;
}

[return: DynamicallyAccessedMembers (Constructors)]
protected virtual Type? GetInvokerTypeForPeerCreationCore (
[DynamicallyAccessedMembers (Constructors)]
Type type)
{
var signature = type.GetCustomAttribute<JniTypeSignatureAttribute> ();
if (signature == null || signature.InvokerType == null) {
return null;
}

Type[] arguments = type.GetGenericArguments ();
if (arguments.Length == 0)
return signature.InvokerType;

return null;
}

[return: DynamicallyAccessedMembers (Constructors)]
[RequiresDynamicCode ("Generic invoker type construction may require runtime generic code generation.")]
[RequiresUnreferencedCode ("Generic invoker type construction may require unreferenced generic parameter annotations.")]
protected virtual Type? GetInvokerTypeCore (
[DynamicallyAccessedMembers (Constructors)]
Type type)
{
// https://github.com/xamarin/xamarin-android/blob/5472eec991cc075e4b0c09cd98a2331fb93aa0f3/src/Microsoft.Android.Sdk.ILLink/MarkJavaObjects.cs#L176-L186
const string makeGenericTypeMessage = "Generic 'Invoker' types are preserved by the MarkJavaObjects trimmer step.";

// FIXME: https://github.com/dotnet/java-interop/issues/1192
[UnconditionalSuppressMessage ("Trimming", "IL2055", Justification = makeGenericTypeMessage)]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = makeGenericTypeMessage)]
[return: DynamicallyAccessedMembers (Constructors)]
static Type MakeGenericType (
[DynamicallyAccessedMembers (Constructors)]
Type type,
Type [] arguments) =>
type.MakeGenericType (arguments);

var signature = type.GetCustomAttribute<JniTypeSignatureAttribute> ();
if (signature == null || signature.InvokerType == null) {
return null;
Expand All @@ -414,7 +483,7 @@ static Type MakeGenericType (
if (arguments.Length == 0)
return signature.InvokerType;

return MakeGenericType (signature.InvokerType, arguments);
return signature.InvokerType.MakeGenericType (arguments);
}

#if NET
Expand Down Expand Up @@ -457,7 +526,7 @@ static Type MakeGenericType (

public virtual void RegisterNativeMembers (
JniType nativeClass,
[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
Type type,
ReadOnlySpan<char> methods)
{
Expand All @@ -466,7 +535,7 @@ public virtual void RegisterNativeMembers (

protected bool TryRegisterNativeMembers (
JniType nativeClass,
[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
Type type,
ReadOnlySpan<char> methods)
{
Expand All @@ -485,7 +554,7 @@ protected bool TryRegisterNativeMembers (
#endif // NET
public virtual void RegisterNativeMembers (
JniType nativeClass,
[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
Type type,
string? methods)
{
Expand All @@ -497,7 +566,7 @@ public virtual void RegisterNativeMembers (
#endif // NET
protected bool TryRegisterNativeMembers (
JniType nativeClass,
[DynamicallyAccessedMembers (MethodsAndPrivateNested)]
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.AllMethods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
Type type,
string? methods)
{
Expand All @@ -511,8 +580,6 @@ protected bool TryRegisterNativeMembers (
// https://github.com/xamarin/xamarin-android/blob/5472eec991cc075e4b0c09cd98a2331fb93aa0f3/src/Microsoft.Android.Sdk.ILLink/PreserveRegistrations.cs#L85
const string MarshalMethods = "'jni_marshal_methods' is preserved by the PreserveRegistrations trimmer step.";

[UnconditionalSuppressMessage ("Trimming", "IL2072", Justification = MarshalMethods)]
[UnconditionalSuppressMessage ("Trimming", "IL2075", Justification = MarshalMethods)]
bool TryLoadJniMarshalMethods (
JniType nativeClass,
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.NonPublicNestedTypes)]
Expand Down Expand Up @@ -605,4 +672,3 @@ bool FindAndCallRegisterMethod (
}
}
}

Loading