Fix native code generation when marshal methods are disabled#7899
Merged
jonpryor merged 2 commits intodotnet:mainfrom Mar 23, 2023
Merged
Conversation
Disabling marshal method generation turns off a lot of native code generation in the `MarshalMethodsNativeAssemblyGenerator` class, but the class is also responsible for outputting correctly sized cache area (an array of X pointers) to be used by the native runtime to cache pointers to `MonoImage` instances. Native runtime trusts the managed runtime to generate correct code and, thus, does not verify the size of generated array. This trust, unfortunately, was broken because with marshal methods disabled, the native code generator output cache array that was 0 entries in size, thus leading to segfault when attempting to run the application. Fix the issue and also parametrize one of the on-device tests to be built twice, with marshal methods explicitly disabled and explicitly enabled.
grendello
requested review from
dellis1972,
jonathanpeppers and
jonpryor
as code owners
jonathanpeppers
approved these changes
Mar 20, 2023
dellis1972
requested changes
Mar 20, 2023
...n.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidApplicationProject.cs
Outdated
Show resolved
Hide resolved
jonpryor
reviewed
Mar 20, 2023
| ); | ||
| } else { | ||
| marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (uniqueAssemblyNames); | ||
| marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (assemblyCount, uniqueAssemblyNames); |
Contributor
There was a problem hiding this comment.
Why is assemblyCount != uniqueAssemblyNames.Count? In what instances will assemblyCount be greater than uniqueAssemblyNames.Count? I guess UseAssemblyStore? https://github.com/xamarin/xamarin-android/blob/54a3f6e0bedc9f9b204a535aaf0f664e22285119/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs#L272-L275
Contributor
Author
There was a problem hiding this comment.
Yep, it's the assembly stores case
jonathanpeppers
pushed a commit
that referenced
this pull request
Mar 24, 2023
… methods are disabled (#7899) Disabling marshal method generation via `$(AndroidEnableMarshalMethods)`=False turns off a lot of native code generation in the `MarshalMethodsNativeAssemblyGenerator` class, but the class is also responsible for outputting a correctly sized cache area (an array of *X* pointers) to be used by the native runtime to cache pointers to `MonoImage` instances. `libmonodroid.so` trusts that `Xamarin.Android.Build.Tasks.dll` et al will generate correct code, and thus does not verify the size of generated array. This trust, unfortunately, was broken because with marshal methods disabled, the native code generator created an output cache array that was 0 entries in size, thus leading to segfault when attempting to run the application. Fix the issue and also parametrize one of the on-device tests to be built twice, with marshal methods explicitly disabled and explicitly enabled.
grendello
added a commit
to grendello/xamarin-android
that referenced
this pull request
Mar 24, 2023
* main: [Xamarin.Android.Build.Tasks] Fix native code generation when marshal methods are disabled (dotnet#7899) [ci] Optimize 'APK's .NET' test job overhead. (dotnet#7904) [Mono.Android] delay JNINativeWrapper.get_runtime_types() (dotnet#7913) Bump external/Java.Interop from `73ebad2` to `53bfb4a` (dotnet#7914)
grendello
added a commit
to grendello/xamarin-android
that referenced
this pull request
Apr 6, 2023
* main: (94 commits) [ci] Remove remaining Classic test jobs. (dotnet#7924) Add Nightly Tests for Humanizer [readme] Add aka.ms links for d17.5. (dotnet#7935) [tests] Remove `net472` multitargeting (dotnet#7932) [monodroid] Fix `ld` build error on Nightly Builds. (dotnet#7925) Bump to xamarin/Java.Interop/main@0355acf (dotnet#7931) [tests] Use msftconnecttest.com in QuoteInvalidQuoteUrlsShouldWork (dotnet#7919) [ci] Don't set demands for megapipeline (dotnet#7929) [Mono.Android] Bind API-UpsideDownCake Developer Preview 1 (dotnet#7796) Bump to dotnet/installer@d109cba3ff 8.0.100-preview.4.23176.5 (dotnet#7921) [Xamarin.Android.Build.Tasks] Fix Android Version Code for Release builds (dotnet#7795) Bump to dotnet/installer@27d6769dfb 8.0.100-preview.4.23172.16 (dotnet#7910) [Xamarin.Android.Build.Tasks] Fix native code generation when marshal methods are disabled (dotnet#7899) [ci] Optimize 'APK's .NET' test job overhead. (dotnet#7904) [Mono.Android] delay JNINativeWrapper.get_runtime_types() (dotnet#7913) Bump external/Java.Interop from `73ebad2` to `53bfb4a` (dotnet#7914) [build] remove .NET 6 support (dotnet#7900) [profiled-aot] update `dotnet.aotprofile` for .NET 8 (dotnet#7908) [tests] Add backup ssl sites in case of 429 response. (dotnet#7909) $(AndroidPackVersionSuffix)=preview.4; net8 is 34.0.0-preview.4 (dotnet#7912) ...
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Fix native code generation when marshal methods are disabled
Disabling marshal method generation turns off a lot of native code
generation in the
MarshalMethodsNativeAssemblyGeneratorclass, but theclass is also responsible for outputting correctly sized cache area (an
array of X pointers) to be used by the native runtime to cache pointers
to
MonoImageinstances.Native runtime trusts the managed runtime to generate correct code and,
thus, does not verify the size of generated array. This trust,
unfortunately, was broken because with marshal methods disabled, the
native code generator output cache array that was 0 entries in size,
thus leading to segfault when attempting to run the application.
Fix the issue and also parametrize one of the on-device tests to be
built twice, with marshal methods explicitly disabled and explicitly
enabled.