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

AST: GenericSignatures point directly to their RequirementMachine

Browse Source 
This avoids a hashtable lookup when performing queries.
This commit is contained in:
Slava Pestov
2021-09-27 20:52:25 -04:00
parent 7e77bc4d87
commit 47ab4a9f28
7 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/AST/ASTContext.cpp
View File

@@ -67,7 +67,6 @@
#include <algorithm>
#include <memory>
#include "RequirementMachine/RequirementMachine.h"
#include "RequirementMachine/RewriteContext.h"
using namespace swift;
@@ -538,14 +537,6 @@ struct ASTContext::Implementation {
/// Memory allocation arena for the term rewriting system.
std::unique_ptr<rewriting::RewriteContext> TheRewriteContext;
/// Stored requirement machines for canonical generic signatures.
///
/// This should come after TheRewriteContext above, since various destructors
/// compile stats in the histograms stored in our RewriteContext.
llvm::DenseMap<GenericSignature,
std::unique_ptr<rewriting::RequirementMachine>>
RequirementMachines;
};
ASTContext::Implementation::Implementation()
@@ -1965,32 +1956,7 @@ ASTContext::getOrCreateRequirementMachine(CanGenericSignature sig) {
if (!rewriteCtx)
rewriteCtx.reset(new rewriting::RewriteContext(*this));
// Check whether we already have a requirement machine for this
// signature.
auto &machines = getImpl().RequirementMachines;
auto &machinePtr = machines[sig];
if (machinePtr) {
auto *machine = machinePtr.get();
if (!machine->isComplete()) {
llvm::errs() << "Re-entrant construction of requirement "
<< "machine for " << sig << "\n";
abort();
}
return machine;
}
auto *machine = new rewriting::RequirementMachine(*rewriteCtx);
// Store this requirement machine before adding the signature,
// to catch re-entrant construction via addGenericSignature()
// below.
machinePtr.reset(machine);
machine->addGenericSignature(sig);
return machine;
return rewriteCtx->getRequirementMachine(sig);
}
bool ASTContext::isRecursivelyConstructingRequirementMachine(
@@ -1999,13 +1965,7 @@ bool ASTContext::isRecursivelyConstructingRequirementMachine(
if (!rewriteCtx)
return false;
auto &machines = getImpl().RequirementMachines;
auto found = machines.find(sig);
if (found == machines.end())
return false;
return !found->second->isComplete();
return rewriteCtx->isRecursivelyConstructingRequirementMachine(sig);
}
Optional<llvm::TinyPtrVector<ValueDecl *>>