Skip to content

Commit a792d3e

Browse files
authored
Some cleanup around PInvokeStaticSigInfo (#52232)
1 parent d058930 commit a792d3e

File tree

10 files changed

+176
-152
lines changed

10 files changed

+176
-152
lines changed

src/coreclr/vm/binder.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,8 +1038,7 @@ void CoreLibBinder::CheckExtended()
10381038
else
10391039
if (pMD->IsNDirect())
10401040
{
1041-
PInvokeStaticSigInfo sigInfo;
1042-
NDirect::PopulateNDirectMethodDesc((NDirectMethodDesc *)pMD, &sigInfo);
1041+
NDirect::PopulateNDirectMethodDesc((NDirectMethodDesc *)pMD);
10431042

10441043
if (pMD->IsQCall())
10451044
{

src/coreclr/vm/classcompat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3311,7 +3311,7 @@ HRESULT MethodTableBuilder::FindMethodDeclarationForMethodImpl(
33113311
IfFailRet(pMDInternalImport->GetNameAndSigOfMemberRef(tkMethod, &pSig, &cSig, &szMember));
33123312

33133313
if (isCallConv(
3314-
MetaSig::GetCallingConvention(NULL, Signature(pSig, cSig)),
3314+
MetaSig::GetCallingConvention(Signature(pSig, cSig)),
33153315
IMAGE_CEE_CS_CALLCONV_FIELD))
33163316
{
33173317
return VLDTR_E_MR_BADCALLINGCONV;

src/coreclr/vm/compile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5735,7 +5735,7 @@ void CEEPreloader::GenerateMethodStubs(
57355735
{
57365736
NDirectMethodDesc* pNMD = (NDirectMethodDesc*)pMD;
57375737
PInvokeStaticSigInfo sigInfo;
5738-
NDirect::PopulateNDirectMethodDesc(pNMD, &sigInfo);
5738+
NDirect::InitializeSigInfoAndPopulateNDirectMethodDesc(pNMD, &sigInfo);
57395739
pStubMD = NDirect::GetILStubMethodDesc((NDirectMethodDesc*)pMD, &sigInfo, dwNGenStubFlags);
57405740
}
57415741
#ifdef FEATURE_COMINTEROP

0 commit comments

Comments
 (0)