Skip to content

Improve the hashtable for EEClassHash #94825

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
davidwrighton merged 15 commits into from
Jan 4, 2024
Merged

Improve the hashtable for EEClassHash #94825

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7e94553
Fixup EEClassHash to support a hash function that includes enclosing …
davidwrighton Nov 14, 2023
e1790ea
Improve instance method hash table
davidwrighton Nov 16, 2023
5b1b6f6
Make GetData safe for lock free access, considering it is used in suc…
davidwrighton Nov 16, 2023
f08041b
Remove use of FindTypeDef from its only common use pattern. This api …
davidwrighton Nov 16, 2023
a97426e
Remove extra hash field we really didn't need on EEClassHashEntry
davidwrighton Nov 16, 2023
ff60cb9
Fix a couple of missed details
davidwrighton Nov 16, 2023
93723fc
Use the right typedef when looking up enclosing types in the fallback…
davidwrighton Nov 16, 2023
14af763
Merge branch 'main' of github.com:dotnet/runtime into betterhash
davidwrighton Nov 27, 2023
81228fe
Spelling fix
davidwrighton Nov 27, 2023
64e1282
Remove FindTypeDef optimization change
davidwrighton Nov 27, 2023
6ceb5d0
Code review feedback
davidwrighton Nov 28, 2023
551c8e9
Fix oops
davidwrighton Nov 30, 2023
67af66d
Fix code review nits
davidwrighton Dec 19, 2023
3dc1e0a
Fix oops
davidwrighton Dec 19, 2023
a41aa8c
Merge branch 'main' of github.com:dotnet/runtime into betterhash
davidwrighton Jan 2, 2024
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
Fix a couple of missed details
  • Loading branch information
@davidwrighton
davidwrighton committed Nov 16, 2023
commit ff60cb926481960839dfd36639cd2d70b4ac0cc8
4 changes: 3 additions & 1 deletion src/coreclr/vm/classhash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,17 +755,19 @@ PTR_EEClassHashEntry EEClassHashTable::FindByNameHandle(const NameHandle* pName)

mdToken typeToken = pName->GetTypeToken();
ModuleBase *pNameModule = pName->GetTypeModule();
PREFIX_ASSUME(pNameModule != NULL);

switch (TypeFromToken(typeToken))
{
case mdtTypeDef:
PREFIX_ASSUME(pNameModule != NULL);
hash = ComputeHashFunctionWithTypeDef(pTable, m_pCaseSensitiveTable, pNameModule->GetMDImport(), typeToken, &failed);
break;
case mdtTypeRef:
PREFIX_ASSUME(pNameModule != NULL);
hash = ComputeHashFunctionWithTypeRef(pTable, m_pCaseSensitiveTable, pNameModule->GetMDImport(), typeToken, &failed);
break;
case mdtExportedType:
PREFIX_ASSUME(pNameModule != NULL);
hash = ComputeHashFunctionWithExportedType(pTable, m_pCaseSensitiveTable, pNameModule->GetMDImport(), typeToken, &failed);
break;
default:
Expand Down
20 changes: 20 additions & 0 deletions src/coreclr/vm/clsload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,26 @@ TypeHandle ClassLoader::LoadTypeByNameThrowing(Assembly *pAssembly,
ClassLoadLevel level)
{
WRAPPER_NO_CONTRACT;

CQuickBytes qbszNamespace;

if (nameSpace == NULL)
{
LPCUTF8 szFullyQualifiedName = name;
nameSpace = "";

if ((name = ns::FindSep(szFullyQualifiedName)) != NULL)
{
SIZE_T d = name - szFullyQualifiedName;
nameSpace = qbszNamespace.SetString(szFullyQualifiedName, d);
name++;
}
else
{
name = szFullyQualifiedName;
}
}

NameHandle nameHandle(nameSpace, name);
return LoadTypeByNameThrowing(pAssembly, &nameHandle, fNotFound, fLoadTypes, level);
}
Expand Down