Skip to content

[TrimmableTypeMap] Emit alias-base entry as unconditional for now #11220

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
simonrozsival merged 1 commit into from
Apr 27, 2026
Merged

[TrimmableTypeMap] Emit alias-base entry as unconditional for now #11220

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion src/Microsoft.Android.Sdk.TrimmableTypeMap/Generator/ModelBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,18 @@ static void EmitPeers (TypeMapAssemblyData model, string jniName,
}

// Base JNI name entry → alias holder (self-referencing trim target, kept alive by associations)
// When ForceUnconditionalEntries is true we MUST emit this as 2-arg (unconditional) just
// like BuildEntry does: dotnet/runtime#127004 strips the TypeMapAssociation that keeps the
// holder alive when a TypeMap entry references the same type, leaving the dictionary key
// missing at runtime and breaking hierarchy lookups for essential types like
// java/lang/String and java/lang/Object.
bool aliasBaseUnconditional = ForceUnconditionalEntries
|| EssentialRuntimeTypes.Contains (jniName)
|| peersForName.Any (IsUnconditionalEntry);
model.Entries.Add (new TypeMapAttributeData {
JniName = jniName,
ProxyTypeReference = holderRef,
TargetTypeReference = holderRef,
TargetTypeReference = aliasBaseUnconditional ? null : holderRef,
});
Comment on lines +185 to 192
Copy link

Copilot AI Apr 27, 2026

Choose a reason for hiding this comment

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

The new alias-base unconditional decision (aliasBaseUnconditional) is a key trimming workaround, but there doesn’t appear to be a unit/integration test asserting that the base alias entry (e.g., "test/Dup" → holder) is emitted as a 2-arg/unconditional TypeMap attribute (i.e., TargetTypeReference == null) when ForceUnconditionalEntries is enabled (and/or when any peer in the alias group is unconditional). Adding a regression test for this would help prevent reintroducing the original issue where only the indexed entries honored ForceUnconditionalEntries.

Copilot uses AI. Check for mistakes.

model.AliasHolders.Add (new AliasHolderData {
Expand Down
3 changes: 0 additions & 3 deletions ...ono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
// Throwable subclass registration
"Java.InteropTests.JnienvTest.ActivatedDirectThrowableSubclassesShouldBeRegistered",

// Typemap doesn't resolve most-derived type
"Java.LangTests.ObjectTest.GetObject_ReturnsMostDerivedType",

// Instance identity after JNI round-trip
"Java.LangTests.ObjectTest.JnienvCreateInstance_RegistersMultipleInstances",

Expand Down