---

yaml
---
r: 294898
b: refs/heads/swift-5.1-branch
c: 6df9338
h: refs/heads/master

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: cf62e6b05d24cffee80a47fe518630f40650cad9
+refs/heads/swift-5.1-branch: 6df93383ae7301008c957a96bd41766ee131dce0
 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/test/Parse/implicit_uninhabited_conversion.swift

@@ -0,0 +1,17 @@
+// RUN: %target-swift-frontend %s -typecheck -verify
+
+let int: Int = fatalError() // expected-error {{cannot convert value of type 'Never' to specified type 'Int'}}
+
+func explicitReturn() -> Int {
+    return fatalError() // expected-error {{cannot convert return expression of type 'Never' to return type 'Int'}}
+}
+
+func explicitMultiElement() -> Int {
+    print("no way")
+    return fatalError() // expected-error {{cannot convert return expression of type 'Never' to return type 'Int'}}
+}
+
+func implicitReturn() -> Int {
+    fatalError()
+}
+