[TrimmableTypeMap] CoreCLR JavaMarshal value-manager split + Java.Interop bump#11799
Open
simonrozsival wants to merge 13 commits into
Open
[TrimmableTypeMap] CoreCLR JavaMarshal value-manager split + Java.Interop bump#11799simonrozsival wants to merge 13 commits into
simonrozsival wants to merge 13 commits into
Conversation
simonrozsival
added
copilot
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-typemap-core
branch
from
45c8058 to
0d7a2a0
Compare
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival
force-pushed
the
dev/simonrozsival/trimmable-typemap-core
branch
from
3f0d176 to
0021abf
Compare
simonrozsival
changed the title
…+ JI bump) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the runtime interop layer to align with the newer Java.Interop value-manager shape by splitting the CoreCLR “JavaMarshal” value-manager behavior into a dedicated CoreClrJavaMarshalValueManager and extracting shared helpers, while removing superseded value-manager implementations.
Changes:
- Introduces
CoreClrJavaMarshalValueManager(reflection-backed) andJavaMarshalValueManagerHelperfor shared peer-type resolution and cast checking. - Removes the old
JavaMarshalValueManager,SimpleValueManager, andAndroidReflectionJniValueManagerimplementations and updates runtime wiring (JNIEnvInit) and project compilation items accordingly. - Adjusts trimming/DAM annotations and api-compat acceptable breakage expectations related to removed
DynamicallyAccessedMembersattributes.
Show a summary per file
| File | Description |
|---|---|
| tests/api-compatibility/acceptable-breakages-vReference-net11.0.txt | Updates acceptable breakages for removed DAM attribute on ColorValueMarshaler.CreateGenericValue. |
| src/Mono.Android/Mono.Android.csproj | Removes old value manager compile items; adds new helper + CoreCLR value manager compile items. |
| src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs | Removes DAM annotations/suppressions and keeps typemap-based type lookups. |
| src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs | Refactors invoker lookup implementation; now directly uses Assembly.GetType/MakeGenericType. |
| src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManagerHelper.cs | Adds shared helper for peer-type normalization and assignability/cast checking. |
| src/Mono.Android/Microsoft.Android.Runtime/CoreClrJavaMarshalValueManager.cs | Adds new reflection-backed CoreCLR value manager implementation. |
| src/Mono.Android/Android.Runtime/JNIEnvInit.cs | Updates value-manager selection to return CoreClrJavaMarshalValueManager for CoreCLR/NativeAOT runtime feature switches. |
| src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs | Removes DAM annotation from CreateGenericValue parameter. |
| src/Mono.Android/Android.Runtime/AndroidRuntime.cs | Removes now-unneeded DAM constants/annotations and adjusts trimming suppressions. |
| src/Mono.Android/Android.Graphics/Color.cs | Removes DAM annotation from ColorValueMarshaler.CreateGenericValue and reformats signature. |
| src/Mono.Android/Android.App/IntentFilterAttribute.Partial.cs | Switches file to #nullable enable. |
| src/Mono.Android/Microsoft.Android.Runtime/SimpleValueManager.cs | Removes obsolete value manager implementation. |
| src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs | Removes superseded value manager implementation. |
| src/Mono.Android/Microsoft.Android.Runtime/AndroidReflectionJniValueManager.cs | Removes superseded reflection value manager base implementation. |
Copilot's findings
- Files reviewed: 15/15 changed files
- Comments generated: 2
Fixes CS0246: 'JavaMarshalValueManager' could not be found. The default value manager now resolves to the internal CoreClrJavaMarshalValueManager (accessible via InternalsVisibleTo), matching the pattern in JNIEnvInit. Suppress the correct trimming warnings (IL2026/IL3050) instead of IL3000. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…alueManager CreatePeerInstance only walked the Java superclass chain, so a Java object returned through a base-interface signature (e.g. an anonymous class that implements a derived interface) was marshalled to the base interface's invoker instead of the most-derived interface proxy. When targetType is an interface, also enumerate the Java class's interfaces (recursively into super-interfaces) and select the most-derived registered .NET type assignable to targetType, mirroring the interface-walk already used by TrimmableTypeMap.GetProxyForJavaObject. Fixes JavaInterfaceLookup_BaseInterfaceReturnType_UsesDerivedInterfaceProxy, TrustManagerFactory_GetTrustManagers_ReturnsIX509TrustManager and the dependent ServerCertificateCustomValidationCallback_* tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… managers Extract the Class.getInterfaces() recursive walk into a shared JavaInterfaceHierarchy.FindFirst helper and use it from both CoreClrJavaMarshalValueManager.CreatePeerInstance and TrimmableTypeMap.TryMatchInterfaces, removing the duplicated JNI plumbing (getInterfaces method id + traversal) from both. No behavior change; consolidates the interface-derived-proxy resolution added in the previous commit. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The value-manager/type-manager split reduces the IL3050 AOT-analysis warnings a basic NativeAOT app produces from 10 to 6: three distinct warnings (reflection-backed ManagedTypeManager ctor, JNIEnv.MakeArrayType, JNINativeWrapper.CreateDelegate), each surfaced twice in the MSBuild summary. Count verified from build.log of the apk and aab NativeAOT runs in CI build 1485907. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The value-manager/type-manager split shrinks the release arm64 app: - NativeAOT: libUnnamedProject.so -10.87%, package 2,474,779 -> 2,286,363 B - CoreCLR: libassembly-store.so -7.19%, package 7,497,147 -> 7,312,827 B apkdiff flags these via --descrease-is-regression, so refresh the reference descriptions. New .apkdesc files taken from the apk/aab BuildReleaseArm64 test attachments in CI build 1485907. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Mono.Android.csproj uses an explicit <Compile> item list, so the new JavaInterfaceHierarchy.cs was not compiled, causing CS0103 'JavaInterfaceHierarchy does not exist' in TrimmableTypeMap.cs and CoreClrJavaMarshalValueManager.cs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Bumps external/Java.Interop and splits the CoreCLR JavaMarshal value manager into its own type, independent of the trimmable type map and array codegen work. This is the cleanest standalone slice of #11617: it lands the Java.Interop bump and the reflection-based CoreCLR manager refactor with no dependency on the other slices.
Changes
external/Java.Interop→8d544738a.CoreClrJavaMarshalValueManager(extendsJniRuntime.ReflectionJniValueManager) + sharedJavaMarshalValueManagerHelper(peer-type resolution, cast checks).JavaMarshalValueManager,SimpleValueManager, andAndroidReflectionJniValueManager.JNIEnvInit.CreateValueManagerreturns the newCoreClrJavaMarshalValueManager;RuntimeFeature.IsAssignableFromCheckadded.Context
Carved out of #11617.
JavaMarshalRegisteredPeersextraction already merged via #11750. The trimmable managers, scanner/emitter, manifest, and R8 changes ship in their own PRs (#11749/#11751/#11753/#11769/#11794/#11796/#11798).Mono.Android compiles cleanly (0 errors).