---

yaml
---
r: 343271
b: refs/heads/master-rebranch
c: 28d0c08
h: refs/heads/master
i:
  343269: f5dcf3f
  343267: 33328b1
  343263: f2ab040

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: 32cfd5bd19592fd281f33bbb7236ba5c74c82c6a
+refs/heads/master-rebranch: 28d0c089bc442c3cbe9abb225631bd4db74af296
 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/CSApply.cpp

@@ -2266,6 +2266,18 @@ namespace {
       if (!choice.isImplicitlyUnwrappedValueOrReturnValue())
         return false;
 
+      // If we have an IUO function call and don't have a disjunction choice,
+      // then it means we didn't create a disjunction because the call was
+      // wrapped in parens (i.e. '(s.returnsAnIUO)()') and so there's no
+      // need to force unwrap.
+      if (!solution.DisjunctionChoices.count(
+              cs.getConstraintLocator(locator))) {
+        auto type = choice.getDecl()->getInterfaceType();
+        assert((type && type->is<AnyFunctionType>()) &&
+               "expected a function type");
+        return false;
+      }
+
       auto *choiceLocator = cs.getConstraintLocator(locator.withPathElement(
           ConstraintLocator::ImplicitlyUnwrappedDisjunctionChoice));