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: Use new form of getOpenedExistentialSignature() in GenericEnvironment::forOpenedExistential()

Browse Source
This commit is contained in:
Slava Pestov
2024-09-02 23:19:18 -04:00
parent e9cec9da65
commit c47f352df7
6 changed files with 54 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/swift/SIL/SILCloner.h
View File

@@ -245,8 +245,8 @@ public:
/// Register a re-mapping for local archetypes such as opened existentials.
void registerLocalArchetypeRemapping(GenericEnvironment *From,
GenericEnvironment *To) {
ASSERT(From->getGenericSignature()->getMaxDepth()
== To->getGenericSignature()->getMaxDepth());
ASSERT(From->getGenericSignature().getPointer()
== To->getGenericSignature().getPointer());
auto result = Functor.LocalArchetypeSubs.insert(std::make_pair(From, To));
assert(result.second);
@@ -380,14 +380,14 @@ public:
void remapRootOpenedType(CanOpenedArchetypeType archetypeTy) {
auto *origEnv = archetypeTy->getGenericEnvironment();
auto subMap = origEnv->getOuterSubstitutions();
ASSERT(!subMap && "Transform the substitution map!");
auto origExistentialTy = origEnv->getOpenedExistentialType()
->getCanonicalType();
auto substExistentialTy = getOpASTType(origExistentialTy);
auto genericSig = origEnv->getGenericSignature();
auto existentialTy = origEnv->getOpenedExistentialType();
auto subMap = origEnv->getOuterSubstitutions();
auto *newEnv = GenericEnvironment::forOpenedExistential(
substExistentialTy, UUID::fromTime());
genericSig, existentialTy, getOpSubstitutionMap(subMap),
UUID::fromTime());
registerLocalArchetypeRemapping(origEnv, newEnv);
}