Skip to content
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

Jump to bottom

[WIP] marshal methods & IntPtr.Size #8156

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[WIP] marshal methods & IntPtr.Size #8156

wants to merge 3 commits into from

Conversation

jonathanpeppers
Copy link
Member

Fixes: #8155

jonpryor
jonpryor reviewed Jun 28, 2023
View reviewed changes
src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs Outdated
@@ -114,47 +114,37 @@ public void Rewrite (DirectoryAssemblyResolver resolver, List<string> targetAsse
}
}

var newAssemblyPaths = new List<string> ();
var newAssemblyPaths = new List<ValueTuple<string, string>> ();
Copy link
Member

Choose a reason for hiding this comment

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

Can we not use the glorious (string Something, string SomethingElse) tuple syntax?

@jonathanpeppers
Copy link
Member Author

This PR is actually an insufficient fix as this list:

xamarin-android/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs

Line 25 in efa14e2

ICollection<AssemblyDefinition> uniqueAssemblies;

Only contains the first android-arm assembly, and so it can only save this assembly on top of the 4 architectures.

I added a parameter to my test:

public void DoNotErrorOnPerArchJavaTypeDuplicates ([Values(true, false)] bool enableMarshalMethods)

It passes on false and fails on true.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonpryor jonpryor jonpryor left review comments

@grendello grendello Awaiting requested review from grendello grendello will be requested when the pull request is marked ready for review grendello is a code owner

@dellis1972 dellis1972 Awaiting requested review from dellis1972 dellis1972 will be requested when the pull request is marked ready for review dellis1972 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

IL Linker Intrinsics + Marshal Methods, oh my!
2 participants
@jonathanpeppers @jonpryor