Skip to content

Type key hash tweaks. #61234

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
VSadov merged 7 commits into from
Nov 8, 2021
Merged

Type key hash tweaks. #61234

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dffeab9
use HashTypeKey(), remove ComputeHash()
VSadov Nov 4, 2021
d60393e
nonrecursive HashTypeHandle
VSadov Nov 5, 2021
c3d2961
remove instrumentation from pendingload.cpp
VSadov Nov 5, 2021
d7b3404
two more uses of `ComputeHash()`
VSadov Nov 5, 2021
b9c3c6e
Make GCC happy
VSadov Nov 5, 2021
2769526
couple tweaks
VSadov Nov 5, 2021
da655bd
unnecessary full fences.
VSadov Nov 7, 2021
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
Prev Previous commit
Next Next commit
couple tweaks
  • Loading branch information
@VSadov
VSadov committed Nov 6, 2021
commit 2769526763914d7031eb4bbdea8af544fc037c2a
11 changes: 5 additions & 6 deletions src/coreclr/vm/typehash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ static DWORD HashPossiblyInstantiatedType(mdTypeDef token, Instantiation inst)
dwHash = ((dwHash << 5) + dwHash) ^ token;
if (!inst.IsEmpty())
{
dwHash = ((dwHash << 5) + dwHash) ^ inst.GetNumArgs();

// Hash n type parameters
for (DWORD i = 0; i < inst.GetNumArgs(); i++)
{
Expand Down Expand Up @@ -224,10 +222,6 @@ static DWORD HashTypeHandle(TypeHandle t)
{
retVal = HashParamType(t.GetInternalCorElementType(), t.GetTypeParam());
}
else if (t.IsGenericVariable())
{
retVal = (dac_cast<PTR_TypeVarTypeDesc>(t.AsTypeDesc())->GetToken());
}
else if (t.HasInstantiation())
{
retVal = HashPossiblyInstantiatedType(t.GetCl(), t.GetInstantiation());
Expand All @@ -237,6 +231,11 @@ static DWORD HashTypeHandle(TypeHandle t)
FnPtrTypeDesc* pTD = t.AsFnPtrType();
retVal = HashFnPtrType(pTD->GetCallConv(), pTD->GetNumArgs(), pTD->GetRetAndArgTypesPointer());
}
else if (t.IsGenericVariable())
{
_ASSERTE(!"Generic variables are unexpected here.");
retVal = t.AsTAddr();
}
else
retVal = HashPossiblyInstantiatedType(t.GetCl(), Instantiation());

Expand Down