Merge pull request #15462 from xedin/rdar-35773761

[Diagnostics] Fix a crash when using `withoutActuallyEscaping` incorrectly

Author: xedin

lib/Sema/CSDiag.cpp

@@ -2111,13 +2111,17 @@ static void eraseOpenedExistentials(Expr *&expr, ConstraintSystem &CS) {
         // Walk the base expression to ensure we erase any existentials within
         // it.
         base = base->walk(*this);
-        
-        bool inserted = OpenExistentials.insert({archetypeVal, base}).second;
-        assert(inserted && "OpaqueValue appears multiple times?");
-        (void)inserted;
+
+        registerOpaqueValue(archetypeVal, base);
         return { true, OOE->getSubExpr() };
       }
-      
+
+      if (auto *MTEE = dyn_cast<MakeTemporarilyEscapableExpr>(expr)) {
+        registerOpaqueValue(MTEE->getOpaqueValue(),
+                            MTEE->getNonescapingClosureValue());
+        return {true, MTEE->getSubExpr()};
+      }
+
       if (auto OVE = dyn_cast<OpaqueValueExpr>(expr)) {
         auto value = OpenExistentials.find(OVE);
         assert(value != OpenExistentials.end() &&
@@ -2166,6 +2170,12 @@ static void eraseOpenedExistentials(Expr *&expr, ConstraintSystem &CS) {
     std::pair<bool, Stmt *> walkToStmtPre(Stmt *S) override {
       return { false, S };
     }
+
+    void registerOpaqueValue(OpaqueValueExpr *opaque, Expr *base) {
+      bool inserted = OpenExistentials.insert({opaque, base}).second;
+      assert(inserted && "OpaqueValue appears multiple times?");
+      (void)inserted;
+    }
   };
 
   expr = expr->walk(ExistentialEraser(CS));

validation-test/compiler_crashers_2_fixed/0148-rdar35773761.swift

@@ -0,0 +1,4 @@
+// RUN: %target-typecheck-verify-swift %s
+
+let b: () -> Void = withoutActuallyEscaping({ print("hello crash") }, do: { $0() })
+// expected-error@-1 {{cannot convert value of type '()' to specified type '() -> Void'}}