Skip to content

Commit 6aff74d

Browse files
committed
---
yaml --- r: 349360 b: refs/heads/master-next c: 0337e5a h: refs/heads/master
1 parent 7e053a7 commit 6aff74d

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
3-
refs/heads/master-next: 1a0757d8692897f31e9ede856897515d1798d308
3+
refs/heads/master-next: 0337e5a130ef26bf4dfe49824e011b5e82e774a0
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/IDE/ExprContextAnalysis.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ static void collectPossibleCalleesByQualifiedLookup(
289289
if (!VD->hasInterfaceType())
290290
continue;
291291
Type declaredMemberType = VD->getInterfaceType();
292+
if (!declaredMemberType->is<AnyFunctionType>())
293+
continue;
292294
if (VD->getDeclContext()->isTypeContext()) {
293295
if (isa<FuncDecl>(VD)) {
294296
if (!isOnMetaType && VD->isStatic())

branches/master-next/test/IDE/complete_crashes.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,3 +368,13 @@ func test_41071587(x: Any) {
368368
}
369369
}
370370
// RDAR_41071587: Begin completions
371+
372+
// rdar://problem/54215016
373+
// RUN: %target-swift-ide-test -code-completion -code-completion-token=RDAR_54215016 -source-filename=%s | %FileCheck %s -check-prefix=RDAR_54215016
374+
struct test_54215016 {
375+
func genericError<Value>()
376+
func test() {
377+
genericError(#^RDAR_54215016^#)
378+
// RDAR_54215016: Begin completions
379+
}
380+
}

0 commit comments

Comments
 (0)