Skip to content

Commit 9418b32

Browse files
committed
[SourceKit] Don't forget to check for nullptr
After 7400d48 we tried to walk into enum elements, but forgot to check for missing types (which caused an assertion in getType) or element decls (which caused an assertion or crash inside passReference). rdar://problem/24634223
1 parent e3e107b commit 9418b32

File tree

3 files changed

+39
-1
lines changed

3 files changed

+39
-1
lines changed

lib/IDE/SourceEntityWalker.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,11 @@ bool SemaAnnotator::walkToTypeReprPost(TypeRepr *T) {
311311

312312
std::pair<bool, Pattern *> SemaAnnotator::walkToPatternPre(Pattern *P) {
313313
if (auto *EP = dyn_cast<EnumElementPattern>(P)) {
314-
return { passReference(EP->getElementDecl(), EP->getType(), DeclNameLoc(EP->getLoc())), P };
314+
auto *Element = EP->getElementDecl();
315+
if (!Element)
316+
return { true, P };
317+
Type T = EP->hasType() ? EP->getType() : Type();
318+
return { passReference(Element, T, DeclNameLoc(EP->getLoc())), P };
315319
}
316320

317321
auto *TP = dyn_cast<TypedPattern>(P);

test/SourceKit/Indexing/index_enum_case.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,14 @@ public enum E {
1919
}
2020

2121
let e: E = .two(a:"String")
22+
23+
func brokenEnums() {
24+
switch NonExistent.A {
25+
case .A:
26+
return "one"
27+
}
28+
switch E.one {
29+
case .tenthousand:
30+
return "one"
31+
}
32+
}

test/SourceKit/Indexing/index_enum_case.swift.response

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,29 @@
128128
key.usr: "s:FO15index_enum_case1E3twoFMS0_FT1aSS_S0_",
129129
key.line: 21,
130130
key.column: 13
131+
},
132+
{
133+
key.kind: source.lang.swift.decl.function.free,
134+
key.name: "brokenEnums()",
135+
key.usr: "s:F15index_enum_case11brokenEnumsFT_T_",
136+
key.line: 23,
137+
key.column: 6,
138+
key.entities: [
139+
{
140+
key.kind: source.lang.swift.ref.enum,
141+
key.name: "E",
142+
key.usr: "s:O15index_enum_case1E",
143+
key.line: 28,
144+
key.column: 10
145+
},
146+
{
147+
key.kind: source.lang.swift.ref.enumelement,
148+
key.name: "one",
149+
key.usr: "s:FO15index_enum_case1E3oneFMS0_S0_",
150+
key.line: 28,
151+
key.column: 12
152+
}
153+
]
131154
}
132155
]
133156
}

0 commit comments

Comments
 (0)