---

yaml
---
r: 343275
b: refs/heads/master-rebranch
c: fc9fef2
h: refs/heads/master
i:
  343273: 1f3af70
  343271: 7462f72

Author: theblixguy

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: b32386bcacbf2c585fbb7af42505d43e88c45f34
+refs/heads/master-rebranch: fc9fef2cf37c166ec87abcaa953ab0ce35ffccda
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/lib/Sema/ConstraintSystem.cpp

@@ -2199,13 +2199,18 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
     if (!type || !type->is<AnyFunctionType>())
       return false;
 
-    if (auto call = dyn_cast<CallExpr>(locator->getAnchor()))
-      return call->getSemanticFn() != call->getFn();
+    auto expr = locator->getAnchor();
+    if (!expr)
+      return false;
 
-    if (auto paren = getParentExpr(locator->getAnchor())) {
-      return isa<ParenExpr>(paren);
+    if (isa<CallExpr>(expr)) {
+      return false;
     }
 
+    auto parentExpr = getParentExpr(expr);
+    if (parentExpr && isa<ParenExpr>(parentExpr))
+      return true;
+
     return false;
   };