IDE: Fix indexing for Sema-built curry thunks

Author: slavapestov

lib/AST/Expr.cpp

@@ -1851,6 +1851,11 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
   case AutoClosureExpr::Kind::SingleCurryThunk: {
     auto *body = getSingleExpressionBody();
     body = body->getSemanticsProvidingExpr();
+
+    if (auto *openExistential = dyn_cast<OpenExistentialExpr>(body)) {
+      body = openExistential->getSubExpr();
+    }
+
     if (auto *outerCall = dyn_cast<ApplyExpr>(body)) {
       return outerCall->getFn();
     }
@@ -1866,6 +1871,11 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
                AutoClosureExpr::Kind::SingleCurryThunk);
       auto *innerBody = innerClosure->getSingleExpressionBody();
       innerBody = innerBody->getSemanticsProvidingExpr();
+
+      if (auto *openExistential = dyn_cast<OpenExistentialExpr>(innerBody)) {
+        innerBody = openExistential->getSubExpr();
+      }
+
       if (auto *outerCall = dyn_cast<ApplyExpr>(innerBody)) {
         if (auto *innerCall = dyn_cast<ApplyExpr>(outerCall->getFn())) {
           if (auto *declRef = dyn_cast<DeclRefExpr>(innerCall->getFn())) {

lib/IDE/SourceEntityWalker.cpp

@@ -276,9 +276,11 @@ std::pair<bool, Expr *> SemaAnnotator::walkToExprPre(Expr *E) {
                                              OpAccess)))
           return stopTraversal;
 
-        return { true, E };
+        return doSkipChildren();
       }
     }
+
+    return { true, E };
   }
 
   if (auto *DRE = dyn_cast<DeclRefExpr>(E)) {

test/Index/expressions.swift

@@ -58,3 +58,13 @@ func test2<X: AP>(x: X) {
   // CHECK: [[@LINE+1]]:19 | type-alias/associated-type/Swift | A | [[AP_P_USR]] | Ref,RelCont | rel: 1
   _ = type(of: x).A.self
 }
+
+protocol Disposable {
+  func dispose()
+}
+
+func useDisposable(_ d: Disposable?) {
+  // CHECK: [[@LINE+1]]:26 | instance-method/Swift | dispose() | s:14swift_ide_test10DisposableP7disposeyyF | Ref,RelCont | rel: 1
+  guard let dispose = d?.dispose else { return }
+  _ = dispose
+}