Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/IDE/ExprContextAnalysis.cpp

@@ -289,6 +289,8 @@ static void collectPossibleCalleesByQualifiedLookup(
     if (!VD->hasInterfaceType())
       continue;
     Type declaredMemberType = VD->getInterfaceType();
+    if (!declaredMemberType->is<AnyFunctionType>())
+      continue;
     if (VD->getDeclContext()->isTypeContext()) {
       if (isa<FuncDecl>(VD)) {
         if (!isOnMetaType && VD->isStatic())

test/IDE/complete_crashes.swift

@@ -368,3 +368,13 @@ func test_41071587(x: Any) {
   }
 }
 // RDAR_41071587: Begin completions
+
+// rdar://problem/54215016
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=RDAR_54215016 -source-filename=%s | %FileCheck %s -check-prefix=RDAR_54215016
+struct test_54215016 {
+  func genericError<Value>()
+  func test() {
+    genericError(#^RDAR_54215016^#)
+// RDAR_54215016: Begin completions
+  }
+}