---

yaml
---
r: 343771
b: refs/heads/master-rebranch
c: a68aa78
h: refs/heads/master
i:
  343769: 62e92dd
  343767: 5c3b0e5

Author: nkcsgexi

[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: 4189b6c99b0279f927b2391cdc4ed3c9906ee61f
+refs/heads/master-rebranch: a68aa78fa1ae385c89908b346428bda5408edc68
 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

@@ -7577,7 +7577,8 @@ bool ConstraintSystem::applySolutionFixes(Expr *E, const Solution &solution) {
           auto *transformedExpr = result->second.second;
           // Since this closure has been transformed into something
           // else let's look inside transformed expression instead.
-          return {true, transformedExpr};
+          transformedExpr->walk(*this);
+          return {false, E};
         }
       }
 

branches/master-rebranch/test/Constraints/function_builder_diags.swift

@@ -199,3 +199,18 @@ struct SR11440 {
     })
   }
 }
+
+func acceptInt(_: Int, _: () -> Void) { }
+
+// SR-11350 crash due to improper recontextualization.
+func erroneousSR11350(x: Int) {
+  tuplify(true) { b in
+    17
+    x + 25
+    Optional(tuplify(false) { b in
+      if b {
+        acceptInt(0) { }
+      }
+    }).domap(0) // expected-error{{value of type 'Optional<()>' has no member 'domap'}}
+  }
+}

branches/master-rebranch/test/SILGen/Inputs/objc_init_iuo_override.h

@@ -0,0 +1,19 @@
+#import <Foundation/Foundation.h>
+
+
+// NB: No NS_ASSUME_NONNULL
+
+@protocol FooProtocol <NSObject>
+
+@property (nonatomic,readonly) NSString *name;
+
+@end
+
+
+@interface ParentClass : NSObject
+
+- (instancetype)initWithFoo:(id<FooProtocol>)foo;
+
+@end
+
+

branches/master-rebranch/test/SILGen/objc_init_iuo_override.swift

@@ -0,0 +1,18 @@
+// SR-8789
+
+// RUN: %target-swift-emit-silgen -verify -import-objc-header %S/Inputs/objc_init_iuo_override.h %s
+// REQUIRES: objc_interop
+
+class ChildClass: ParentClass {}
+
+class GrandchildClass: ChildClass {
+	// The original init is defined in objc as:
+        //   - (instancetype)initWithFoo:(id<FooProtocol>)foo;
+        // without nullability audits, meaning the signature in Swift is:
+        //   init!(foo: FooProtocol)
+        // and
+	override init(foo: FooProtocol) {
+		super.init(foo: foo)
+	}
+}
+