Don't attempt to apply solution from salvage.

Match the behavior of typeCheckExpressionImpl which simply calls solve
and applySolution but never salvage.

Author: nate-chandler

Diff for: lib/Sema/TypeCheckStmt.cpp

@@ -1997,17 +1997,8 @@ bool TypeChecker::typeCheckFunctionBodyUntil(FuncDecl *FD,
         // In either case, we should assume that the intent was to implicitly
         // return the single expression and diagnose accordingly, per the first
         // call to solve.
-        auto HadSalvageError = cs.salvage(viable, E);
-        if (!HadSalvageError) {
-          auto &solution = viable[0];
-          E = cs.applySolution(solution, E, resultType, /*discardedExpr=*/false, 
-                               /*skipClosures*/false);
-          if (E != FD->getSingleExpressionBody())
-            FD->setSingleExpressionBody(E);
-          setAutoClosureDiscriminators(FD, BS);
-          FD->setBody(BS);
-        }
-        return HadSalvageError;
+        cs.salvage(viable, E);
+        return true;
       }
     }
   }

Diff for: test/Parse/omit_return.swift

@@ -1,7 +1,5 @@
 // RUN: %target-swift-frontend %s -typecheck -verify
 
-import Foundation
-
 // MARK: - Helpers
 
 
@@ -50,10 +48,6 @@ struct DynamicStruct {
     subscript(dynamicMember input: String) -> String { return input } 
 }
 
-class DynamicSubscriptClass {
-  @objc subscript (i : Int) -> String { "howdy" }
-}
-
 struct MyOwnArray<Element> : ExpressibleByArrayLiteral {
     init(arrayLiteral elements: Element...) {}
 }
@@ -413,10 +407,6 @@ func ff_implicitDynamicMember(_ s: DynamicStruct) -> String {
     s.foo
 }
 
-func ff_implicitDynamicSubscript(_ c: DynamicSubscriptClass) -> String {
-    c[13]
-}
-
 func ff_implicitParenExpr() -> Int {
     (3 + 5)
 }
@@ -546,14 +536,6 @@ func ff_implicitAssignExpr(newValue: Int) -> Void {
     __ff_implicitAssignExpr = newValue
 }
 
-func ff_implicitObjcSelectorExpr() -> Selector {
-    #selector(NSArray.object(at:))
-}
-
-func ff_implicitKeyPathExpr() -> String {
-    #keyPath(NSArray.count)
-}
-
 func ff_implicitMemberAccessInit() -> Initable {
     .init()
 }
@@ -1733,6 +1715,10 @@ class CImplicitIdentityExpr { func gimme() -> CImplicitIdentityExpr { self } }
 
 class CImplicitDotSelfExpr { func gimme() -> CImplicitDotSelfExpr { self.self } }
 
+func badIs<T>(_ value: Any, anInstanceOf type: T.Type) -> Bool {
+    value is type // expected-error {{use of undeclared type 'type'}}
+}
+
 
 
 // Autoclosure Discriminators

Diff for: test/Parse/omit_return_foundation.swift

@@ -0,0 +1,20 @@
+// RUN: %target-swift-frontend %s -typecheck -verify
+
+import Foundation
+
+class DynamicSubscriptClass {
+  @objc subscript (i : Int) -> String { "howdy" }
+}
+
+func ff_implicitDynamicSubscript(_ c: DynamicSubscriptClass) -> String {
+    c[13]
+}
+
+func ff_implicitObjcSelectorExpr() -> Selector {
+    #selector(NSArray.object(at:))
+}
+
+func ff_implicitKeyPathExpr() -> String {
+    #keyPath(NSArray.count)
+}
+