Skip to content

SPMI: tolerate null pResolvedToken #48208

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 1 commit into from
Feb 12, 2021
Merged

SPMI: tolerate null pResolvedToken #48208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 41 additions & 24 deletions src/coreclr/ToolBox/superpmi/superpmi-shared/spmirecordhelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,14 @@ inline Agnostic_CORINFO_RESOLVED_TOKENin SpmiRecordsHelper::CreateAgnostic_CORIN
{
Agnostic_CORINFO_RESOLVED_TOKENin tokenIn;
ZeroMemory(&tokenIn, sizeof(tokenIn));
tokenIn.tokenContext = CastHandle(pResolvedToken->tokenContext);
tokenIn.tokenScope = CastHandle(pResolvedToken->tokenScope);
tokenIn.token = (DWORD)pResolvedToken->token;
tokenIn.tokenType = (DWORD)pResolvedToken->tokenType;

if (pResolvedToken != nullptr)
{
tokenIn.tokenContext = CastHandle(pResolvedToken->tokenContext);
tokenIn.tokenScope = CastHandle(pResolvedToken->tokenScope);
tokenIn.token = (DWORD)pResolvedToken->token;
tokenIn.tokenType = (DWORD)pResolvedToken->tokenType;
}
return tokenIn;
}

Expand All @@ -126,12 +130,16 @@ inline Agnostic_CORINFO_RESOLVED_TOKENout SpmiRecordsHelper::
{
Agnostic_CORINFO_RESOLVED_TOKENout tokenOut;
ZeroMemory(&tokenOut, sizeof(tokenOut));
tokenOut.hClass = CastHandle(pResolvedToken->hClass);
tokenOut.hMethod = CastHandle(pResolvedToken->hMethod);
tokenOut.hField = CastHandle(pResolvedToken->hField);

tokenOut.cbTypeSpec = (DWORD)pResolvedToken->cbTypeSpec;
tokenOut.cbMethodSpec = (DWORD)pResolvedToken->cbMethodSpec;
if (pResolvedToken != nullptr)
{
tokenOut.hClass = CastHandle(pResolvedToken->hClass);
tokenOut.hMethod = CastHandle(pResolvedToken->hMethod);
tokenOut.hField = CastHandle(pResolvedToken->hField);

tokenOut.cbTypeSpec = (DWORD)pResolvedToken->cbTypeSpec;
tokenOut.cbMethodSpec = (DWORD)pResolvedToken->cbMethodSpec;
}

tokenOut.pTypeSpec_Index = -1;
tokenOut.pMethodSpec_Index = -1;
Expand All @@ -146,10 +154,13 @@ inline Agnostic_CORINFO_RESOLVED_TOKENout SpmiRecordsHelper::StoreAgnostic_CORIN
Agnostic_CORINFO_RESOLVED_TOKENout tokenOut(
CreateAgnostic_CORINFO_RESOLVED_TOKENout_without_buffers(pResolvedToken));

tokenOut.pTypeSpec_Index =
(DWORD)buffers->AddBuffer((unsigned char*)pResolvedToken->pTypeSpec, pResolvedToken->cbTypeSpec);
tokenOut.pMethodSpec_Index =
(DWORD)buffers->AddBuffer((unsigned char*)pResolvedToken->pMethodSpec, pResolvedToken->cbMethodSpec);
if (pResolvedToken != nullptr)
{
tokenOut.pTypeSpec_Index =
(DWORD)buffers->AddBuffer((unsigned char*)pResolvedToken->pTypeSpec, pResolvedToken->cbTypeSpec);
tokenOut.pMethodSpec_Index =
(DWORD)buffers->AddBuffer((unsigned char*)pResolvedToken->pMethodSpec, pResolvedToken->cbMethodSpec);
}

return tokenOut;
}
Expand All @@ -160,10 +171,13 @@ inline Agnostic_CORINFO_RESOLVED_TOKENout SpmiRecordsHelper::RestoreAgnostic_COR
{
Agnostic_CORINFO_RESOLVED_TOKENout tokenOut(
CreateAgnostic_CORINFO_RESOLVED_TOKENout_without_buffers(pResolvedToken));
tokenOut.pTypeSpec_Index =
(DWORD)buffers->Contains((unsigned char*)pResolvedToken->pTypeSpec, pResolvedToken->cbTypeSpec);
tokenOut.pMethodSpec_Index =
(DWORD)buffers->Contains((unsigned char*)pResolvedToken->pMethodSpec, pResolvedToken->cbMethodSpec);
if (pResolvedToken != nullptr)
{
tokenOut.pTypeSpec_Index =
(DWORD)buffers->Contains((unsigned char*)pResolvedToken->pTypeSpec, pResolvedToken->cbTypeSpec);
tokenOut.pMethodSpec_Index =
(DWORD)buffers->Contains((unsigned char*)pResolvedToken->pMethodSpec, pResolvedToken->cbMethodSpec);
}
return tokenOut;
}

Expand Down Expand Up @@ -194,13 +208,16 @@ inline void SpmiRecordsHelper::Restore_CORINFO_RESOLVED_TOKENout(
Agnostic_CORINFO_RESOLVED_TOKENout& tokenOut,
LightWeightMap<key, value>* buffers)
{
pResolvedToken->hClass = (CORINFO_CLASS_HANDLE)tokenOut.hClass;
pResolvedToken->hMethod = (CORINFO_METHOD_HANDLE)tokenOut.hMethod;
pResolvedToken->hField = (CORINFO_FIELD_HANDLE)tokenOut.hField;
pResolvedToken->pTypeSpec = (PCCOR_SIGNATURE)buffers->GetBuffer(tokenOut.pTypeSpec_Index);
pResolvedToken->cbTypeSpec = (ULONG)tokenOut.cbTypeSpec;
pResolvedToken->pMethodSpec = (PCCOR_SIGNATURE)buffers->GetBuffer(tokenOut.pMethodSpec_Index);
pResolvedToken->cbMethodSpec = (ULONG)tokenOut.cbMethodSpec;
if (pResolvedToken != nullptr)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only called for resolveToken and tryResolveToken. Can pResolvedToken ever be null for those?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not? I can try to minimize where we do this, if you think it's important.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it's not that important.

{
pResolvedToken->hClass = (CORINFO_CLASS_HANDLE)tokenOut.hClass;
pResolvedToken->hMethod = (CORINFO_METHOD_HANDLE)tokenOut.hMethod;
pResolvedToken->hField = (CORINFO_FIELD_HANDLE)tokenOut.hField;
pResolvedToken->pTypeSpec = (PCCOR_SIGNATURE)buffers->GetBuffer(tokenOut.pTypeSpec_Index);
pResolvedToken->cbTypeSpec = (ULONG)tokenOut.cbTypeSpec;
pResolvedToken->pMethodSpec = (PCCOR_SIGNATURE)buffers->GetBuffer(tokenOut.pMethodSpec_Index);
pResolvedToken->cbMethodSpec = (ULONG)tokenOut.cbMethodSpec;
}
}

inline Agnostic_CORINFO_SIG_INFO SpmiRecordsHelper::CreateAgnostic_CORINFO_SIG_INFO_without_buffers(
Expand Down