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

[SIL] Use SubstitutionMap in KeyPathInst rather than SubstitutionList.

Browse Source
This commit is contained in:
Doug Gregor
2018-05-02 20:52:30 -07:00
parent 5724338abe
commit 7e08b66499
11 changed files with 49 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/SIL/SILVerifier.cpp
View File

@@ -123,15 +123,11 @@ void verifyKeyPathComponent(SILModule &M,
const KeyPathPatternComponent &component,
ArrayRef<Operand> operands,
CanGenericSignature patternSig,
SubstitutionList patternSubList,
SubstitutionMap patternSubs,
bool forPropertyDescriptor,
bool hasIndices) {
auto &C = M.getASTContext();
SubstitutionMap patternSubs;
if (patternSig)
patternSubs = patternSig->getSubstitutionMap(patternSubList);
auto loweredBaseTy =
M.Types.getLoweredType(AbstractionPattern::getOpaque(), baseTy);
auto componentTy = component.getComponentType().subst(patternSubs)
@@ -149,7 +145,7 @@ void verifyKeyPathComponent(SILModule &M,
"operator");
auto substEqualsType = equals->getLoweredFunctionType()
->substGenericArgs(M, patternSubList);
->substGenericArgs(M, patternSubs);
require(substEqualsType->getParameters().size() == 2,
"must have two arguments");
@@ -181,7 +177,7 @@ void verifyKeyPathComponent(SILModule &M,
"operator");
auto substHashType = hash->getLoweredFunctionType()
->substGenericArgs(M, patternSubList);
->substGenericArgs(M, patternSubs);
require(substHashType->getParameters().size() == 1,
"must have two arguments");
@@ -262,7 +258,7 @@ void verifyKeyPathComponent(SILModule &M,
{
auto getter = component.getComputedPropertyGetter();
auto substGetterType = getter->getLoweredFunctionType()
->substGenericArgs(M, patternSubList);
->substGenericArgs(M, patternSubs);
require(substGetterType->getRepresentation() ==
SILFunctionTypeRepresentation::Thin,
"getter should be a thin function");
@@ -301,7 +297,7 @@ void verifyKeyPathComponent(SILModule &M,
auto setter = component.getComputedPropertySetter();
auto substSetterType = setter->getLoweredFunctionType()
->substGenericArgs(M, patternSubList);
->substGenericArgs(M, patternSubs);
require(substSetterType->getRepresentation() ==
SILFunctionTypeRepresentation::Thin,
@@ -4136,10 +4132,7 @@ public:
auto baseTy = CanType(kpBGT->getGenericArgs()[0]);
auto pattern = KPI->getPattern();
SubstitutionMap patternSubs;
if (pattern->getGenericSignature())
patternSubs = pattern->getGenericSignature()
->getSubstitutionMap(KPI->getSubstitutions());
SubstitutionMap patternSubs = KPI->getSubstitutions();
require(baseTy == pattern->getRootType().subst(patternSubs)->getCanonicalType(),
"keypath root type should match root type of keypath pattern");
@@ -4783,10 +4776,10 @@ void SILProperty::verify(const SILModule &M) const {
->getCanonicalType(sig);
auto leafTy = decl->getStorageInterfaceType()->getReferenceStorageReferent()
->getCanonicalType(sig);
SubstitutionList subs;
SubstitutionMap subs;
if (sig) {
auto env = dc->getGenericEnvironmentOfContext();
subs = env->getForwardingSubstitutions();
subs = env->getForwardingSubstitutionMap();
baseTy = env->mapTypeIntoContext(baseTy)->getCanonicalType();
leafTy = env->mapTypeIntoContext(leafTy)->getCanonicalType();
}