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

RequirementMachine: Code review feedback from @CodaFi

Browse Source
This commit is contained in:
Slava Pestov
2021-06-02 14:18:51 -04:00
parent 6df75ee610
commit a7486b4723
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/AST/ASTContext.cpp
View File

@@ -1843,9 +1843,10 @@ RequirementMachine *ASTContext::getOrCreateRequirementMachine(
// signature.
auto arena = getArena(sig);
auto &machines = getImpl().getArena(arena).RequirementMachines;
auto known = machines.find(sig);
if (known != machines.end()) {
auto *machine = known->second.get();
auto &machinePtr = machines[sig];
if (machinePtr) {
auto *machine = machinePtr.get();
if (!machine->isComplete()) {
llvm::errs() << "Re-entrant construction of requirement "
<< "machine for " << sig << "\n";
@@ -1855,12 +1856,12 @@ RequirementMachine *ASTContext::getOrCreateRequirementMachine(
return machine;
}
// Create a new requirement machine with the given signature.
auto machine = new RequirementMachine(*this);
auto *machine = new RequirementMachine(*this);
// Store this requirement machine before adding the signature,
// to catch re-entrant construction.
machines[sig] = std::unique_ptr<RequirementMachine>(machine);
// to catch re-entrant construction via addGenericSignature()
// below.
machinePtr = std::unique_ptr<RequirementMachine>(machine);
machine->addGenericSignature(sig);