Skip to content

Fix JIT assert with UnsafeAccessor and delegate ctor #125868

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
EgorBo merged 3 commits into from
Mar 30, 2026
+27 −5
Merged

Fix JIT assert with UnsafeAccessor and delegate ctor #125868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d23942
Initial plan
Copilot Mar 20, 2026
ed56a2b
Fix JIT assert with UnsafeAccessor and delegate ctor
Copilot Mar 20, 2026
7512f3b
Merge branch 'main' into copilot/fix-jit-assert-unsafeaccessor
EgorBo Mar 27, 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
6 changes: 1 addition & 5 deletions src/coreclr/jit/flowgraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,10 +1104,6 @@ GenTree* Compiler::fgOptimizeDelegateConstructor(GenTreeCall* call,

targetMethodHnd = ldftnToken->m_token.hMethod;
}
else
{
assert(targetMethodHnd == nullptr);
}

#ifdef FEATURE_READYTORUN
if (IsAot())
Expand Down Expand Up @@ -1161,7 +1157,7 @@ GenTree* Compiler::fgOptimizeDelegateConstructor(GenTreeCall* call,
#ifndef TARGET_WASM // TODO-WASM: Wasm doesn't use the dynamically composed helpers yet. When we do, we probably will
// need to use a different set of arguments to construct the right helper call to avoid dynamically
// composing a helper
else if (oper == GT_FTN_ADDR)
else if ((oper == GT_FTN_ADDR) && (ldftnToken != nullptr))
{
JITDUMP("optimized\n");

Expand Down
26 changes: 26 additions & 0 deletions src/tests/baseservices/compilerservices/UnsafeAccessors/UnsafeAccessorsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,32 @@ public static void Verify_CallCtorWithEmptyNotNullName()
extern static UserDataClass CallPrivateConstructorWithEmptyName();
}

interface IDelegateTarget
{
static virtual object GetValue() => "DelegateTargetValue";
}

class DelegateTargetImpl : IDelegateTarget { }

delegate object DelegateFromUnsafeAccessor();

[UnsafeAccessor(UnsafeAccessorKind.Constructor)]
extern static DelegateFromUnsafeAccessor ConstructDelegate(object o, IntPtr p);

static class DelegateTargetResolver<T> where T : IDelegateTarget
{
public static unsafe delegate*<object> Resolve() => &T.GetValue;
}

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

var del = ConstructDelegate(null, (nint)DelegateTargetResolver<DelegateTargetImpl>.Resolve());
Assert.Equal("DelegateTargetValue", del());
}

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