Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 17c2640

Browse files
committed
Merge pull request #3911 from JohnChen0/r2r-release
Fix generic struct delegate in ReadyToRun (#3690)
2 parents 84854bd + cad5b83 commit 17c2640

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/vm/prestub.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,6 +2349,14 @@ PCODE DynamicHelperFixup(TransitionBlock * pTransitionBlock, TADDR * pCell, DWOR
23492349
fReliable = true;
23502350
case ENCODE_DELEGATE_CTOR:
23512351
pMD = ZapSig::DecodeMethod(pModule, pInfoModule, pBlob, &th);
2352+
if (pMD->RequiresInstArg())
2353+
{
2354+
pMD = MethodDesc::FindOrCreateAssociatedMethodDesc(pMD,
2355+
th.AsMethodTable(),
2356+
FALSE /* forceBoxedEntryPoint */,
2357+
pMD->GetMethodInstantiation(),
2358+
FALSE /* allowInstParam */);
2359+
}
23522360
pMD->EnsureActive();
23532361
break;
23542362
default:

0 commit comments

Comments
 (0)