averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace operator StringMaps with Identifier-keyed DenseMaps.

Browse Source 
Micro-optimization, but avoids extra indirection and allocation associated
with StringMaps.

Swift SVN r9083
This commit is contained in:
Jordan Rose
2013-10-09 19:11:21 +00:00
parent e83d0d608a
commit 589341ac79
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/AST/Module.cpp
View File

@@ -831,13 +831,17 @@ void Module::getDisplayDecls(SmallVectorImpl<Decl*> &results) {
}
namespace {
template <typename T>
using IdentifierMap = SourceFile::IdentifierMap<T>;
// Returns Nothing on error, Optional(nullptr) if no operator decl found, or
// Optional(decl) if decl was found.
template<typename OP_DECL>
Optional<OP_DECL *> lookupOperatorDeclForName(Module *M,
SourceLoc Loc,
Identifier Name,
llvm::StringMap<OP_DECL *> SourceFile::*OP_MAP)
SourceLoc Loc,
Identifier Name,
IdentifierMap<OP_DECL *> SourceFile::*OP_MAP)
{
if (auto loadedModule = dyn_cast<LoadedModule>(M))
return loadedModule->lookupOperator<OP_DECL>(Name);
@@ -847,9 +851,9 @@ Optional<OP_DECL *> lookupOperatorDeclForName(Module *M,
return Nothing;
// Look for an operator declaration in the current module.
auto found = (TU->MainSourceFile->*OP_MAP).find(Name.get());
auto found = (TU->MainSourceFile->*OP_MAP).find(Name);
if (found != (TU->MainSourceFile->*OP_MAP).end())
return found->getValue()? Optional<OP_DECL *>(found->getValue()) : Nothing;
return found->second ? Optional<OP_DECL *>(found->second) : Nothing;
// Look for imported operator decls.
@@ -867,13 +871,13 @@ Optional<OP_DECL *> lookupOperatorDeclForName(Module *M,
// If we found a single import, use it.
if (importedOperators.empty()) {
// Cache the mapping so we don't need to troll imports next time.
(TU->MainSourceFile->*OP_MAP)[Name.get()] = nullptr;
(TU->MainSourceFile->*OP_MAP)[Name] = nullptr;
return Nothing;
}
if (importedOperators.size() == 1) {
// Cache the mapping so we don't need to troll imports next time.
OP_DECL *result = *importedOperators.begin();
(TU->MainSourceFile->*OP_MAP)[Name.get()] = result;
(TU->MainSourceFile->*OP_MAP)[Name] = result;
return result;
}
@@ -892,7 +896,7 @@ Optional<OP_DECL *> lookupOperatorDeclForName(Module *M,
}
}
// Cache the mapping so we don't need to troll imports next time.
(TU->MainSourceFile->*OP_MAP)[Name.get()] = first;
(TU->MainSourceFile->*OP_MAP)[Name] = first;
return first;
}
} // end anonymous namespace