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

[TypeCheck] Bad Self GTPTs from invalid protocols shouldn't crash.

Browse Source
This commit is contained in:
Huon Wilson
2017-02-24 22:55:55 -08:00
parent 644f6df424
commit 76525439d0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/GenericTypeResolver.h
View File

@@ -166,8 +166,11 @@ public:
/// This should only be used when resolving/validating where clauses in /// This should only be used when resolving/validating where clauses in
/// protocols. /// protocols.
class ProtocolRequirementTypeResolver : public GenericTypeResolver { class ProtocolRequirementTypeResolver : public GenericTypeResolver {
ProtocolDecl *Proto;
public: public:
explicit ProtocolRequirementTypeResolver() {} explicit ProtocolRequirementTypeResolver(ProtocolDecl *proto)
: Proto(proto) {}
virtual Type resolveGenericTypeParamType(GenericTypeParamType *gp); virtual Type resolveGenericTypeParamType(GenericTypeParamType *gp);

2
lib/Sema/TypeCheckDecl.cpp
View File

@@ -4348,7 +4348,7 @@ public:
if (auto whereClause = assocType->getTrailingWhereClause()) { if (auto whereClause = assocType->getTrailingWhereClause()) {
DeclContext *lookupDC = assocType->getDeclContext(); DeclContext *lookupDC = assocType->getDeclContext();
ProtocolRequirementTypeResolver resolver; ProtocolRequirementTypeResolver resolver(PD);
TypeResolutionOptions options; TypeResolutionOptions options;
for (auto &req : whereClause->getRequirements()) { for (auto &req : whereClause->getRequirements()) {

3
lib/Sema/TypeCheckGeneric.cpp
View File

@@ -130,7 +130,7 @@ void GenericTypeToArchetypeResolver::recordParamType(ParamDecl *decl, Type type)
Type ProtocolRequirementTypeResolver::resolveGenericTypeParamType( Type ProtocolRequirementTypeResolver::resolveGenericTypeParamType(
GenericTypeParamType *gp) { GenericTypeParamType *gp) {
assert(gp->getDepth() == 0 && gp->getIndex() == 0 && assert(gp->isEqual(Proto->getSelfInterfaceType()) &&
"found non-Self-shaped GTPT when resolving protocol requirement"); "found non-Self-shaped GTPT when resolving protocol requirement");
return gp; return gp;
} }
@@ -143,6 +143,7 @@ Type ProtocolRequirementTypeResolver::resolveDependentMemberType(
Type ProtocolRequirementTypeResolver::resolveSelfAssociatedType( Type ProtocolRequirementTypeResolver::resolveSelfAssociatedType(
Type selfTy, AssociatedTypeDecl *assocType) { Type selfTy, AssociatedTypeDecl *assocType) {
assert(selfTy->isEqual(Proto->getSelfInterfaceType()));
return assocType->getDeclaredInterfaceType(); return assocType->getDeclaredInterfaceType();
} }