Skip to content

[CoreCLR] Avoid having any internal calls in managed code for CoreCLR. Fixes #15343. #15358

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

Merged
merged 2 commits into from
Jul 11, 2022
Merged

[CoreCLR] Avoid having any internal calls in managed code for CoreCLR. Fixes #15343. #15358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
683d49e
[NSObject] Avoid having any internal calls in managed code for CoreCL…
rolfbjarne Jun 27, 2022
b59c82c
Merge branch 'main' into issue-15343-coreclr-ecall
rolfbjarne Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions src/Foundation/NSObject2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,28 +282,18 @@ internal Flags FlagsInternal {
}
#endif

#if !NET || !__MACOS__
[MethodImplAttribute (MethodImplOptions.InternalCall)]
extern static void RegisterToggleRef (NSObject obj, IntPtr handle, bool isCustomType);
#endif // !NET || !__MACOS__

[DllImport ("__Internal")]
static extern void xamarin_release_managed_ref (IntPtr handle, [MarshalAs (UnmanagedType.I1)] bool user_type);

#if NET
static void RegisterToggleRefMonoVM (NSObject obj, IntPtr handle, bool isCustomType)
{
// We need this indirection for CoreCLR, otherwise JITting RegisterToggleReference will throw System.Security.SecurityException: ECall methods must be packaged into a system module.
RegisterToggleRef (obj, handle, isCustomType);
}
#endif

static void RegisterToggleReference (NSObject obj, IntPtr handle, bool isCustomType)
{
#if NET
if (Runtime.IsCoreCLR) {
Runtime.RegisterToggleReferenceCoreCLR (obj, handle, isCustomType);
} else {
RegisterToggleRefMonoVM (obj, handle, isCustomType);
}
#if NET && __MACOS__
Runtime.RegisterToggleReferenceCoreCLR (obj, handle, isCustomType);
#else
RegisterToggleRef (obj, handle, isCustomType);
#endif
Expand Down