Skip to content

[CoreCLR] Align AddPeer() peer-replacement rule with MonoVM #12271

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 1 commit into from
Jul 31, 2026
+15 −2
Merged

[CoreCLR] Align AddPeer() peer-replacement rule with MonoVM #12271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalRegisteredPeers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,23 @@ public static void AddPeer (IJavaPeerable value)
continue;
if (!JniEnvironment.Types.IsSameObject (target.PeerReference, value.PeerReference))
continue;
if (target.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable)) {
// JNIEnv.NewObject/JNIEnv.CreateInstance() compatibility.
// When two MCW's are created for one Java instance [0],
Comment thread
jonathanpeppers marked this conversation as resolved.
// we want the 2nd MCW to replace the 1st, as the 2nd is
// the one the dev created; the 1st is an implicit intermediary.
//
// Meanwhile, a new "replaceable" instance should *not* replace an
// existing "replaceable" instance; see dotnet/android#9862.
//
// [0]: If Java ctor invokes overridden virtual method, we'll
// transition into managed code w/o a registered instance, and
// thus will create an "intermediary" via
// (IntPtr, JniHandleOwnership) .ctor.
if (target.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable) &&
!value.JniManagedPeerState.HasFlag (JniManagedPeerStates.Replaceable)) {
peer.Dispose ();
peers [i] = new ReferenceTrackingHandle (value);
} else {
} else if (JniEnvironment.Runtime.ObjectReferenceManager.LogGlobalReferenceMessages) {
WarnNotReplacing (key, value, target);
}
GC.KeepAlive (target);
Expand Down