Skip to content

Commit 871514e

Browse files
committed
---
yaml --- r: 343270 b: refs/heads/master-rebranch c: 32cfd5b h: refs/heads/master
1 parent f5dcf3f commit 871514e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14551455
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14561456
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14571457
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1458-
refs/heads/master-rebranch: 67971488ddb4d15efa494f43023249cac5e95219
1458+
refs/heads/master-rebranch: 32cfd5bd19592fd281f33bbb7236ba5c74c82c6a
14591459
refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
14601460
refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
14611461
refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,6 +2193,11 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
21932193
// then we need to only create a single constraint that binds the
21942194
// type to an optional.
21952195
auto isIUOCallWrappedInParens = [&]() {
2196+
auto decl = choice.getDecl();
2197+
auto type = decl ? decl->getInterfaceType() : nullptr;
2198+
if (!type || !type->is<AnyFunctionType>())
2199+
return false;
2200+
21962201
auto paren = getParentExpr(locator->getAnchor());
21972202
auto result = paren ? isa<ParenExpr>(paren) : false;
21982203
return result;

0 commit comments

Comments
 (0)