[CoreCLR] Support marshal methods #9912
Merged
Conversation
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
…al/coreclr-marshal-methods
grendello
reviewed
Mar 13, 2025
8524974 to
3780ce6
Compare
grendello
approved these changes
Mar 14, 2025
jonpryor
reviewed
Mar 14, 2025
|
|
||
| [[gnu::visibility("default")]] extern void xamarin_app_init (JNIEnv *env, get_function_pointer_fn fn) noexcept; | ||
| #endif // def RELEASE | ||
| extern "C" [[gnu::visibility("default")]] void xamarin_app_init (JNIEnv *env, get_function_pointer_fn fn) noexcept; |
There was a problem hiding this comment.
Why was this moved outside of the #if RELEASE block? Is it somehow present in Debug config builds? (Are those even meaningfully supported at present?)
There was a problem hiding this comment.
…or maybe it always needs to exist because it's in the pinvoke-tables…
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is a follow-up to #9805 and #9900
This PR makes it possible to enable marshal methods in CoreCLR apps in the Release configuration by using the
$(AndroidEnableMarshalMethods)=true.Note: It is not necessary to set
$(_AndroidUseManagedMarshalMethodsLookup)=truemanually when using CoreCLR. This is because the it is the only marshal methods lookup method supported on CoreCLR.This PR contains the following changes:
xamarin_app_initmethod is added to the pinvoke overridesxamarin_app_initmethod is called when$(AndroidEnableMarshalMethods)=true._mm_wrappermethod for methods which already have[UnmanagedCallersOnly]attributesin
MarshalMethodsAssemblyRewriter. There was a bug in [Experimental] Add alternative way of resolving UCO function pointers for Marshal Methods #9805 which created an_Activate_mm_mm_wrapperUCO which called the hand-written
n_Activate_mmUCO. This wasn't caught earlier because Mono does not throwwhen a managed function calls an UCO. On CoreCLR, this codepath failed with
Invalid Program: attempted to call a UnmanagedCallersOnly method from managed code..