Resolve merge conflict

Author: calda

lib/Sema/MiscDiagnostics.cpp

@@ -2074,9 +2074,10 @@ static void diagnoseImplicitSelfUseInClosure(const Expr *E,
 
       // If the closure's type was inferred to be noescape, then it doesn't
       // need qualification.
-      if (AnyFunctionRef(const_cast<AbstractClosureExpr *>(CE))
-              .isKnownNoEscape())
-        return false;
+      if (auto funcTy = CE->getType()->getAs<FunctionType>()) {
+        if (funcTy->isNoEscape())
+          return false;
+      }
 
       if (auto autoclosure = dyn_cast<AutoClosureExpr>(CE)) {
         if (autoclosure->getThunkKind() == AutoClosureExpr::Kind::AsyncLet)