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

Merge pull request #21704 from slavapestov/remove-restate-filtering-consumer

Browse Source 
Fix a crash by removing the RestateFilteringConsumer
This commit is contained in:
Slava Pestov
2019-01-08 08:03:59 -05:00
committed by GitHub
parent 66bc1661b2 3c0206d72e
commit dffa857b2a
12 changed files with 159 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/IDE/CodeCompletion.cpp
View File

@@ -3180,20 +3180,26 @@ public:
Kind = LookupKind::ValueExpr;
NeedLeadingDot = !HaveDot;
// This is horrible
ExprType = ExprType->getRValueType();
assert(!ExprType->hasTypeParameter());
this->ExprType = ExprType;
if (ExprType->hasTypeParameter()) {
DeclContext *DC = nullptr;
if (VD)
DC = VD->getInnermostDeclContext();
else if (auto NTD = ExprType->getInOutObjectType()
->getMetatypeInstanceType()->getAnyNominal())
DC = NTD;
if (DC)
ExprType = DC->mapTypeIntoContext(ExprType);
// Open existential types, so that lookupVisibleMemberDecls() can properly
// substitute them.
bool WasOptional = false;
if (auto OptionalType = ExprType->getOptionalObjectType()) {
ExprType = OptionalType;
WasOptional = true;
}
if (!ExprType->getMetatypeInstanceType()->isAnyObject())
if (ExprType->isAnyExistentialType())
ExprType = OpenedArchetypeType::getAny(ExprType);
if (WasOptional)
ExprType = OptionalType::get(ExprType);
// Handle special cases
bool isIUO = VD && VD->getAttrs()
.hasAttribute<ImplicitlyUnwrappedOptionalAttr>();
@@ -4188,13 +4194,12 @@ public:
}
}
void addDesignatedInitializers(Type CurrTy) {
void addDesignatedInitializers(NominalTypeDecl *NTD) {
if (hasFuncIntroducer || hasVarIntroducer || hasTypealiasIntroducer ||
hasOverridabilityModifier)
return;
assert(CurrTy);
const auto *CD = dyn_cast_or_null<ClassDecl>(CurrTy->getAnyNominal());
const auto *CD = dyn_cast<ClassDecl>(NTD);
if (!CD)
return;
if (!CD->hasSuperclass())
@@ -4211,14 +4216,12 @@ public:
}
}
void addAssociatedTypes(Type CurrTy) {
void addAssociatedTypes(NominalTypeDecl *NTD) {
if (!hasTypealiasIntroducer &&
(hasFuncIntroducer || hasVarIntroducer || hasInitializerModifier ||
hasOverride || hasOverridabilityModifier))
return;
NominalTypeDecl *NTD = CurrTy->getAnyNominal();
for (auto Conformance : NTD->getAllConformances()) {
auto Proto = Conformance->getProtocol();
if (!Proto->isAccessibleFrom(CurrDeclContext))
@@ -4244,13 +4247,14 @@ public:
if (isa<ProtocolDecl>(CurrDeclContext))
return;
Type CurrTy = CurrDeclContext->getDeclaredTypeInContext();
Type CurrTy = CurrDeclContext->getSelfTypeInContext();
auto *NTD = CurrDeclContext->getSelfNominalTypeDecl();
if (CurrTy && !CurrTy->is<ErrorType>()) {
lookupVisibleMemberDecls(*this, CurrTy, CurrDeclContext,
TypeResolver,
/*includeInstanceMembers=*/false);
addDesignatedInitializers(CurrTy);
addAssociatedTypes(CurrTy);
addDesignatedInitializers(NTD);
addAssociatedTypes(NTD);
}
}
};