Skip to content

Commit f5dcf3f

Browse files
committed
---
yaml --- r: 343269 b: refs/heads/master-rebranch c: 6797148 h: refs/heads/master i: 343267: 33328b1
1 parent 5b5cdc5 commit f5dcf3f

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
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: b33c5208c1beb59b290fde87187f9a19e5f1bd50
1458+
refs/heads/master-rebranch: 67971488ddb4d15efa494f43023249cac5e95219
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: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2194,16 +2194,8 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
21942194
// type to an optional.
21952195
auto isIUOCallWrappedInParens = [&]() {
21962196
auto paren = getParentExpr(locator->getAnchor());
2197-
auto call = getParentExpr(paren);
2198-
2199-
if (call && isa<CallExpr>(call)) {
2200-
auto callExpr = cast<CallExpr>(call);
2201-
if (callExpr->getFn() != callExpr->getSemanticFn()) {
2202-
return true;
2203-
}
2204-
}
2205-
2206-
return false;
2197+
auto result = paren ? isa<ParenExpr>(paren) : false;
2198+
return result;
22072199
};
22082200

22092201
// In some cases we already created the appropriate bind constraints.

0 commit comments

Comments
 (0)