[runtime] Allow IntPtr for native objects in the dynamic registrar. Fixes #15708#15712
Merged
rolfbjarne merged 5 commits intodotnet:xcode14from Aug 23, 2022
Merged
[runtime] Allow IntPtr for native objects in the dynamic registrar. Fixes #15708#15712rolfbjarne merged 5 commits intodotnet:xcode14from
IntPtr for native objects in the dynamic registrar. Fixes #15708#15712rolfbjarne merged 5 commits intodotnet:xcode14from
Conversation
…ixes dotnet#15708 Allow code like this ```csharp [DllImport(Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSendSuper") static extern IntPtr IntPtr_objc_msgSendSuper(IntPtr receiver, IntPtr selector); [DllImport(Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSendSuper")] static extern void void_objc_msgSendSuper(IntPtr receiver, IntPtr selector, IntPtr arg); [Export("selectedTextRange")] public new IntPtr SelectedTextRange { get { return IntPtr_objc_msgSendSuper(SuperHandle, Selector.GetHandle("selectedTextRange")); } set => void_objc_msgSendSuper(SuperHandle, Selector.GetHandle("setSelectedTextRange:"), value); } ``` to work on the dynamic registrar since it already work with the static one. This allows the simulators (which defaults to dynamic) to share the same code which is useful for implementing a workaround for related issue dotnet#15677.
Member
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
stephen-hawley
suggested changes
Aug 19, 2022
| if (!strcmp (fullname, "System.IntPtr")) { | ||
| returnValue = *(void **) mono_object_unbox (retval); | ||
| } else { | ||
| xamarin_assertion_message ("Don't know how to marshal a return value of type '%s.%s'. Please file a bug with a test case at https://github.com/xamarin/xamarin-macios/issues/new\n", mono_class_get_namespace (r_klass), mono_class_get_name (r_klass)); |
Contributor
There was a problem hiding this comment.
Since you have the fullname, why not change the assertion message to:
xamarin_assertion_message ("Don't know how to marshal a return value of type '%s', Please Please file a bug with a test case at https://github.com/xamarin/xamarin-macios/issues/new\n", full name);
On a side note, I wonder if this won't be immediately stale with the .NET 6 transition to NativeHandle instead of IntPtr.
Contributor
Author
There was a problem hiding this comment.
Both good points @stephen-hawley I'll address them shortly. Thanks!
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Member
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
spouliot
added a commit
to spouliot/uno
that referenced
this pull request
Aug 20, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
Merged
6 tasks
rolfbjarne
requested changes
Aug 22, 2022
runtime/trampolines.m
Outdated
| #if DOTNET | ||
| if (!strcmp (fullname, "System.IntPtr") || !strcmp (fullname, "ObjCRuntime.NativeHandle")) { | ||
| #else | ||
| if (!strcmp (fullname, "System.IntPtr")) { |
Member
There was a problem hiding this comment.
There are two functions that are much faster and simpler: xamarin_is_class_intptr and xamarin_is_class_nativehandle, no need to compute a full type name nor compare strings.
stephen-hawley
suggested changes
Aug 22, 2022
runtime/trampolines.m
Outdated
| } | ||
| } else { | ||
| xamarin_assertion_message ("Don't know how to marshal a return value of type '%s.%s'. Please file a bug with a test case at https://github.com/xamarin/xamarin-macios/issues/new\n", mono_class_get_namespace (r_klass), mono_class_get_name (r_klass)); | ||
| char *fullname = xamarin_class_get_full_name (r_klass, exception_gchandle); |
Contributor
There was a problem hiding this comment.
last little bit - since fullname is only used in the error and @rolfbjarne implies that it's more costly than the xamarin_is_class_ tests, how about moving the allocation and deallocation into the else clause so that the price only gets paid in the failing case.
Contributor
Author
There was a problem hiding this comment.
I reverted the assertion to the original code as it did not need (extra) allocation, inside the caller, and still produced the same output.
stephen-hawley
approved these changes
Aug 22, 2022
Member
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This comment has been minimized.
This comment has been minimized.
Member
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
✅ API diff for current PR / commitLegacy Xamarin (No breaking changes)
NET (empty diffs)
❗ API diff vs stable (Breaking changes)Legacy Xamarin (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
.NET (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
✅ Generator diffGenerator diff is empty Pipeline on Agent |
Collaborator
💻 [PR Build] Tests on macOS Mac Catalina (10.15) passed 💻✅ All tests on macOS Mac Catalina (10.15) passed. Pipeline on Agent |
Collaborator
Collaborator
❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌Failed tests are:
Pipeline on Agent |
Collaborator
🔥 [CI Build] Test results 🔥Test results❌ Tests failed on VSTS: simulator tests 0 tests crashed, 7 tests failed, 221 tests passed. Failures❌ introspection testsDetails
Html Report (VSDrops) Download ❌ mononative testsDetails
Html Report (VSDrops) Download ❌ monotouch testsDetails
Html Report (VSDrops) Download Successes✅ bcl: All 69 tests passed. Html Report (VSDrops) Download Pipeline on Agent |
rolfbjarne
approved these changes
Aug 23, 2022
Member
|
Test failures are unrelated (https://github.com/xamarin/maccore/issues/581, https://github.com/xamarin/maccore/issues/2558) |
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 25, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 25, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 26, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 30, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 30, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 31, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Aug 31, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
jeromelaban
pushed a commit
to unoplatform/uno
that referenced
this pull request
Sep 6, 2022
…ashes Pro: It does not break app compatibility, selection works Con: This does not work _currently_ with the dynamic registrar [1] which is the default when building for iOS simulators. OTOH there's a workaround for that [2]. [1] Unless building with the iOS SDK for Xcode 14 (currently only previews) once dotnet/macios#15712 is merged [2] Adding `--registrar=static` to the simulator builds will fix this, sadly build times will be longer (so better use [1] asap)
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
5 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.
Allow code like this
to work on the dynamic registrar since it already work with the static one.
This allows the simulators (which defaults to dynamic) to share the same code which is useful for implementing a workaround for related issue #15677.