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

[CodeCompletion] Protect against a couple of null Types

Browse Source 
Fix two crashes related to unresolved-member completion where either the
EnumDecl itself is missing, or its elements have not been type-checked.
Incidentally, resolve the type of the enum elements in the case where I
have observed this happening.

rdar://problem/26860249
This commit is contained in:
Ben Langmuir
2016-06-29 09:55:09 -07:00
parent 2141eacf1a
commit dbf848e9cf
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/IDE/CodeCompletion.cpp
View File

@@ -2621,6 +2621,7 @@ public:
(EED->hasAccessibility() && !EED->isAccessibleFrom(CurrDeclContext)) ||
shouldHideDeclFromCompletionResults(EED))
return;
CommandWordsPairs Pairs;
CodeCompletionResultBuilder Builder(
Sink,
@@ -2633,14 +2634,18 @@ public:
Builder.addTextChunk(EED->getName().str());
if (EED->hasArgumentType())
addPatternFromType(Builder, EED->getArgumentType());
Type EnumType = EED->getType();
// Enum element is of function type such as EnumName.type -> Int ->
// EnumName; however we should show Int -> EnumName as the type
if (auto FuncType = EED->getType()->getAs<AnyFunctionType>()) {
EnumType = FuncType->getResult();
Type EnumType;
if (EED->hasType()) {
EnumType = EED->getType();
if (auto FuncType = EnumType->getAs<AnyFunctionType>()) {
EnumType = FuncType->getResult();
}
}
addTypeAnnotation(Builder, EnumType);
if (EnumType)
addTypeAnnotation(Builder, EnumType);
}
void addKeyword(StringRef Name, Type TypeAnnotation,
@@ -2936,7 +2941,10 @@ public:
}
}
bool handleEnumElement(Decl *D, DeclVisibilityKind Reason) {
bool handleEnumElement(ValueDecl *D, DeclVisibilityKind Reason) {
if (!D->hasType())
TypeResolver->resolveDeclSignature(D);
if (auto *EED = dyn_cast<EnumElementDecl>(D)) {
addEnumElementRef(EED, Reason, /*HasTypeContext=*/true);
return true;
@@ -2944,6 +2952,8 @@ public:
llvm::DenseSet<EnumElementDecl *> Elements;
ED->getAllElements(Elements);
for (auto *Ele : Elements) {
if (!Ele->hasType())
TypeResolver->resolveDeclSignature(Ele);
addEnumElementRef(Ele, Reason, /*HasTypeContext=*/true);
}
return true;
@@ -3655,7 +3665,8 @@ public:
LookupByName Lookup(*this, FuncNames);
lookupVisibleDecls(Lookup, CurrDeclContext, TypeResolver.get(), true);
if (HasReturn)
Lookup.unboxType(getReturnTypeFromContext(CurrDeclContext));
if (auto ReturnType = getReturnTypeFromContext(CurrDeclContext))
Lookup.unboxType(ReturnType);
}
static bool getPositionInTupleExpr(DeclContext &DC, Expr *Target,