Skip to content

[Trimming] Update value managers for annotated peer activation #11436

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

Merged
jonathanpeppers merged 5 commits into from
May 22, 2026
Merged

[Trimming] Update value managers for annotated peer activation #11436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8284538
Update ValueManagers
simonrozsival May 20, 2026
303f5f6
Use reviewed Java.Interop ActivatePeer API
simonrozsival May 21, 2026
fe87e14
Remove Java.Interop submodule bump
simonrozsival May 21, 2026
36d5472
Potential fix for pull request finding
simonrozsival May 21, 2026
0a37e75
Bump external/Java.Interop from `d3636b4` to `d546a08`
dependabot[bot] May 22, 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
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated 8 files
+1 −1 external/xamarin-android-tools
+27 −3 src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
+1 −1 src/Java.Interop/Java.Interop/ManagedPeer.cs
+2 −0 src/Java.Interop/PublicAPI.Unshipped.txt
+0 −35 src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
+0 −29 src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
+0 −5 tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
+0 −5 tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
6 changes: 5 additions & 1 deletion src/Mono.Android/Android.Runtime/AndroidRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,11 @@ 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 (
JniObjectReference reference,
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] Type type,
ConstructorInfo cinfo,
object?[]? argumentValues)
{
Java.Interop.TypeManager.Activate (reference.Handle, cinfo, argumentValues);
}
Expand Down
35 changes: 4 additions & 31 deletions src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,39 +249,12 @@ public override void FinalizePeer (IJavaPeerable value)
value.Finalized ();
}

public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
public override void ActivatePeer (JniObjectReference reference, [DynamicallyAccessedMembers (Constructors)] Type type, ConstructorInfo cinfo, object?[]? argumentValues)
{
try {
ActivateViaReflection (reference, cinfo, argumentValues);
} catch (Exception e) {
var m = string.Format (
CultureInfo.InvariantCulture,
"Could not activate {{ PeerReference={0} IdentityHashCode=0x{1} Java.Type={2} }} for managed type '{3}'.",
reference,
GetJniIdentityHashCode (reference).ToString ("x", CultureInfo.InvariantCulture),
JniEnvironment.Types.GetJniTypeNameFromInstance (reference),
cinfo.DeclaringType?.FullName);
Debug.WriteLine (m);

throw new NotSupportedException (m, e);
}
}

void ActivateViaReflection (JniObjectReference reference, 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
self.SetPeerReference (reference);

cinfo.Invoke (self, argumentValues);
if (RuntimeFeature.TrimmableTypeMap)
throw new PlatformNotSupportedException ("Activating Java peers is not supported when TrimmableTypeMap is enabled.");

[UnconditionalSuppressMessage ("Trimming", "IL2073", Justification = "🤷‍♂️")]
[return: DynamicallyAccessedMembers (Constructors)]
Type GetDeclaringType (ConstructorInfo cinfo) =>
cinfo.DeclaringType ?? throw new NotSupportedException ("Do not know the type to create!");
base.ActivatePeer (reference, type, cinfo, argumentValues);
}

public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
Expand Down
35 changes: 0 additions & 35 deletions src/Mono.Android/Microsoft.Android.Runtime/SimpleValueManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,41 +207,6 @@ public override void FinalizePeer (IJavaPeerable value)
value.Finalized ();
}

public override void ActivatePeer (IJavaPeerable? self, JniObjectReference reference, ConstructorInfo cinfo, object?[]? argumentValues)
{
try {
ActivateViaReflection (reference, cinfo, argumentValues);
} catch (Exception e) {
var m = string.Format (
CultureInfo.InvariantCulture,
"Could not activate {{ PeerReference={0} IdentityHashCode=0x{1} Java.Type={2} }} for managed type '{3}'.",
reference,
GetJniIdentityHashCode (reference).ToString ("x", CultureInfo.InvariantCulture),
JniEnvironment.Types.GetJniTypeNameFromInstance (reference),
cinfo.DeclaringType?.FullName);
Debug.WriteLine (m);

throw new NotSupportedException (m, e);
}
}

void ActivateViaReflection (JniObjectReference reference, 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
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 ()
{
if (RegisteredInstances == null)
Expand Down