---

yaml
---
r: 294879
b: refs/heads/swift-5.1-branch
c: b1284d7
h: refs/heads/master
i:
  294877: 3fb01bd
  294875: 3562dfd
  294871: 6d89610
  294863: 4d69ce8
  294847: 52d6c7e

Author: nate-chandler

[refs]

@@ -1242,7 +1242,7 @@ refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
 refs/heads/swift-5.1-old-llvm-branch: 9cef8175146f25b72806154b8a0f4a3f52e3e400
-refs/heads/swift-5.1-branch: 9e39efb56d905f4aa81e02901265a86e82bef09e
+refs/heads/swift-5.1-branch: b1284d7a777cec2860fa261e693958b8248e20b9
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-03-a: 4591c933063ddcb0d6cd6d0cdd01086b2f9b244d

branches/swift-5.1-branch/lib/Sema/TypeCheckStmt.cpp

@@ -17,6 +17,7 @@
 #include "TypeChecker.h"
 #include "TypeCheckType.h"
 #include "MiscDiagnostics.h"
+#include "ConstraintSystem.h"
 #include "swift/Subsystems.h"
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/ASTWalker.h"
@@ -1923,7 +1924,8 @@ bool TypeChecker::typeCheckFunctionBodyUntil(FuncDecl *FD,
   // FIXME: FIXME_NOW: DETERMINE: What is the appropriate place for this code to
   //        live?
   if (FD->hasSingleExpressionBody()) {
-    auto fnType = FD->getBodyResultTypeLoc().getType();
+    auto fnTypeLoc = FD->getBodyResultTypeLoc();
+    auto fnType = fnTypeLoc.getType();
     auto returnStmt = cast<ReturnStmt>(BS->getElement(0).get<Stmt *>());
     auto E = returnStmt->getResult();
 
@@ -1935,7 +1937,7 @@ bool TypeChecker::typeCheckFunctionBodyUntil(FuncDecl *FD,
     //             FD->setSingleExpressionBody(E);
     //           }
 
-    if (FD->getBodyResultTypeLoc().isNull() || fnType->isVoid()) {
+    if (fnTypeLoc.isNull() || fnType->isVoid()) {
       auto voidExpr = TupleExpr::createEmpty(Context,
                                              E->getStartLoc(),
                                              E->getEndLoc(),
@@ -1949,15 +1951,23 @@ bool TypeChecker::typeCheckFunctionBodyUntil(FuncDecl *FD,
     } else {
       // FIXME: FIXME_NOW: DETERMINE: Is this the appropriate mechanism to use
       //        to divine the type of E?
-      auto exprTy = typeCheckExpression(E, FD, TypeLoc(),
-                                        CTP_ReturnStmt);
-      if (!exprTy.isNull() && exprTy->isUninhabited() &&
-          exprTy->getCanonicalType() != fnType->getCanonicalType()) {
-        BS = BraceStmt::create(Context,
-                               BS->getStartLoc(),
-                               { E },
-                               BS->getEndLoc(),
-                               /*implicit=*/true);
+      preCheckExpression(E, FD);
+      constraints::ConstraintSystem cs(*this, FD, 
+                                       constraints::ConstraintSystemFlags::SuppressDiagnostics);
+      SmallVector<constraints::Solution, 4> viable;
+      if(!cs.solve(E, /*convertType*/Type(), nullptr, viable,
+                   FreeTypeVariableBinding::Disallow)) {
+        auto &solution = viable[0];
+        auto &solutionCS = solution.getConstraintSystem();
+        Type exprType = solution.simplifyType(solutionCS.getType(E));
+        if (!exprType.isNull() && exprType->isUninhabited() &&
+            exprType->getCanonicalType() != fnType->getCanonicalType()) {
+          BS = BraceStmt::create(Context,
+                                 BS->getStartLoc(),
+                                 { E },
+                                 BS->getEndLoc(),
+                                 /*implicit=*/true);
+        }
       }
     }
   }

branches/swift-5.1-branch/test/Parse/omit_return.swift

@@ -34,6 +34,23 @@ func myOwnFatalError() -> MyOwnNever { fatalError() }
 
 func identity<T>(_ t: T) -> T { t }
 
+internal func _fatalErrorFlags() -> UInt32 {
+    return 0
+}
+internal func _assertionFailure(
+  _ prefix: StaticString, _ message: String,
+  flags: UInt32
+) -> Never {
+    fatalError()
+} 
+internal func _diagnoseUnexpectedEnumCaseValue<SwitchedValue, RawValue>(
+  type: SwitchedValue.Type,
+  rawValue: RawValue
+) -> Never {
+  _assertionFailure("Fatal error",
+                    "unexpected enum case '\(type)(rawValue: \(rawValue))'",
+                    flags: _fatalErrorFlags())
+}
 
 
 // MARK: - Free Functions
@@ -62,6 +79,22 @@ func ff_implicitClosure() -> () -> Void {
     { print("howdy") }
 }
 
+func ff_explicitMultilineClosure() -> () -> String {
+    return {
+        let one = "big a"
+        let two = "little a"
+        return "\(one) + \(two)"
+    }
+}
+
+func ff_implicitMultilineClosure() -> () -> String {
+    {
+        let one = "big a"
+        let two = "little a"
+        return "\(one) + \(two)"
+    }
+}
+
 func ff_implicitWrong() -> String {
     17 // expected-error {{cannot convert return expression of type 'Int' to return type 'String'}}
 }
@@ -242,6 +275,22 @@ var fv_implicitClosure: () -> Void {
     { print("howdy") }
 }
 
+var fv_explicitMultilineClosure: () -> String {
+    return {
+        let one = "big a"
+        let two = "little a"
+        return "\(one) + \(two)"
+    }
+}
+
+var fv_implicitMultilineClosure: () -> String {
+    {
+        let one = "big a"
+        let two = "little a"
+        return "\(one) + \(two)"
+    }
+}
+
 var fv_implicitWrong: String {
     17 // expected-error {{cannot convert return expression of type 'Int' to return type 'String'}}
 }
@@ -400,6 +449,26 @@ var fvg_implicitClosure: () -> Void {
     }
 }
 
+var fvg_explicitMultilineClosure: () -> String {
+    get {
+        return {
+            let one = "big a"
+            let two = "little a"
+            return "\(one) + \(two)"
+        }
+    }
+}
+
+var fvg_implicitMultilineClosure: () -> String {
+    get {
+        {
+            let one = "big a"
+            let two = "little a"
+            return "\(one) + \(two)"
+        }
+    }
+}
+
 var fvg_implicitWrong: String {
     get {
         17 // expected-error {{cannot convert return expression of type 'Int' to return type 'String'}}
@@ -726,6 +795,26 @@ enum S_implicitClosure {
     }
 }
 
+enum S_explicitMultilineClosure {
+   subscript() -> () -> String {
+        return {
+            let one = "big a"
+            let two = "little a"
+            return "\(one) + \(two)"
+        }
+    }
+}
+
+enum S_implicitMultilineClosure {
+    subscript() -> () -> String {
+        {
+            let one = "big a"
+            let two = "little a"
+            return "\(one) + \(two)"
+        }
+    }
+}
+
 enum S_implicitWrong {
     subscript() -> String {
         17 // expected-error {{cannot convert return expression of type 'Int' to return type 'String'}}
@@ -932,6 +1021,30 @@ enum SRO_implicitClosure {
     }
 }
 
+enum SRO_explicitMultilineClosure {
+   subscript() -> () -> String {
+        get {
+            return {
+                let one = "big a"
+                let two = "little a"
+                return "\(one) + \(two)"
+            }
+        }
+    }
+}
+
+enum SRO_implicitMultilineClosure {
+    subscript() -> () -> String {
+        get {
+            {
+                let one = "big a"
+                let two = "little a"
+                return "\(one) + \(two)"
+            }
+        }
+    }
+}
+
 enum SRO_implicitWrong {
     subscript() -> String {
         get {