Skip to content

Remove inconsistent UnmanagedCallersOnly delegate construction check #122906

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
jkotas merged 5 commits into from
Jan 7, 2026
Merged

Remove inconsistent UnmanagedCallersOnly delegate construction check #122906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96669f3
Initial plan
Copilot Jan 5, 2026
9e13001
Remove UnmanagedCallersOnly delegate check and related test
Copilot Jan 6, 2026
ec0a160
Remove unused NotSupported_UnmanagedCallersOnlyTarget resource string
Copilot Jan 6, 2026
87a6e53
Merge branch 'main' into copilot/remove-unmanagedcallersonly-check
jkotas Jan 6, 2026
7e62f4e
Merge branch 'main' into copilot/remove-unmanagedcallersonly-check
jkotas Jan 6, 2026
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
7 changes: 0 additions & 7 deletions src/coreclr/vm/comdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,13 +2793,6 @@ MethodDesc* COMDelegate::GetDelegateCtor(TypeHandle delegateType, MethodDesc *pT
// associated with the instantiation.
BOOL fMaybeCollectibleAndStatic = FALSE;

// Do not allow static methods with [UnmanagedCallersOnlyAttribute] to be a delegate target.
// A method marked UnmanagedCallersOnly is special and allowing it to be delegate target will destabilize the runtime.
if (pTargetMethod->HasUnmanagedCallersOnlyAttribute())
{
COMPlusThrow(kNotSupportedException, W("NotSupported_UnmanagedCallersOnlyTarget"));
}

if (isStatic)
{
// When this method is called and the method being considered is shared, we typically
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3092,9 +3092,6 @@
<data name="NotSupported_MustBeModuleBuilder" xml:space="preserve">
<value>Module argument must be a ModuleBuilder.</value>
</data>
<data name="NotSupported_UnmanagedCallersOnlyTarget" xml:space="preserve">
<value>Methods with UnmanagedCallersOnlyAttribute cannot be used as delegate target.</value>
</data>
<data name="NotSupported_NoCodepageData" xml:space="preserve">
<value>No data is available for encoding {0}. For information on defining a custom encoding, see the documentation for the Encoding.RegisterProvider method.</value>
</data>
Expand Down
41 changes: 0 additions & 41 deletions src/tests/Interop/UnmanagedCallersOnly/InvalidCallbacks.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,47 +101,6 @@
ret
}

.method public hidebysig static
int32 ManagedDoubleCallback (
int32 n
) cil managed
{
.custom instance void [System.Runtime.InteropServices]System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute::.ctor() = (
01 00 00 00
)
.maxstack 1

nop
ldarg.0
call int32 InvalidCSharp.CallingUnmanagedCallersOnlyDirectly::DoubleImpl(int32)
ret
}

.method private hidebysig static
int32 DoubleImpl (
int32 n
) cil managed
{
.maxstack 2

nop
ldc.i4.2
ldarg.0
mul
ret
}

.method public hidebysig static
class [System.Runtime]System.Func`2<int32, int32> GetDoubleDelegate () cil managed
{
.maxstack 8

ldnull
ldftn int32 InvalidCSharp.CallingUnmanagedCallersOnlyDirectly::ManagedDoubleCallback(int32)
newobj instance void class [System.Runtime]System.Func`2<int32, int32>::.ctor(object, native int)
ret
}

.method public hidebysig static pinvokeimpl("UnmanagedCallersOnlyDll" as "DoesntExist" winapi)
int32 PInvokeMarkedWithUnmanagedCallersOnly (
int32 n
Expand Down
16 changes: 0 additions & 16 deletions src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,6 @@ public static void TestUnmanagedCallersOnlyValid_ThrowException()
Assert.Equal(-1, UnmanagedCallersOnlyDll.CallManagedProcCatchException((IntPtr)(delegate* unmanaged<int, int>)&CallbackThrows, n));
}

[Fact]
public static void NegativeTest_ViaDelegate()
{
Console.WriteLine($"Running {nameof(NegativeTest_ViaDelegate)}...");

// Try invoking method directly
Assert.Throws<NotSupportedException>(() => { CallAsDelegate(); });

// Local function to delay exception thrown during JIT
void CallAsDelegate()
{
Func<int, int> invoker = CallingUnmanagedCallersOnlyDirectly.GetDoubleDelegate();
invoker(0);
}
}

[Fact]
public static void NegativeTest_NonStaticMethod()
{
Expand Down
Loading