---

yaml
---
r: 322999
b: refs/heads/tensorflow-next
c: 1d3b2a9
h: refs/heads/master
i:
  322997: df16de4
  322995: 0ef8fe2
  322991: 108af1e

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: f9f14c3613e037d124a9b4709ab27781351113d9
+refs/heads/tensorflow-next: 1d3b2a90b3bc5ccff871502191c73bdbcf38e019

branches/tensorflow-next/lib/SILOptimizer/Mandatory/DiagnoseInvalidEscapingCaptures.cpp

@@ -146,6 +146,28 @@ const ParamDecl *getParamDeclFromOperand(SILValue value) {
   return nullptr;
 }
 
+bool isUseOfSelfInInitializer(Operand *oper) {
+  if (auto *PBI = dyn_cast<ProjectBoxInst>(oper->get())) {
+    if (auto *MUI = dyn_cast<MarkUninitializedInst>(PBI->getOperand())) {
+      switch (MUI->getKind()) {
+      case MarkUninitializedInst::Kind::Var:
+        return false;
+      case MarkUninitializedInst::Kind::RootSelf:
+      case MarkUninitializedInst::Kind::CrossModuleRootSelf:
+      case MarkUninitializedInst::Kind::DerivedSelf:
+      case MarkUninitializedInst::Kind::DerivedSelfOnly:
+      case MarkUninitializedInst::Kind::DelegatingSelf:
+      case MarkUninitializedInst::Kind::DelegatingSelfAllocated:
+        return true;
+      }
+
+      llvm_unreachable("Bad MarkUninitializedInst::Kind");
+    }
+  }
+
+  return false;
+}
+
 static bool checkForEscapingPartialApplyUses(PartialApplyInst *PAI) {
   // Avoid exponential path exploration.
   SmallVector<Operand *, 8> uses;
@@ -301,14 +323,18 @@ static void checkPartialApply(ASTContext &Context, DeclContext *DC,
 
   // First, diagnose the inout captures, if any.
   for (auto inoutCapture : inoutCaptures) {
-    auto *param = getParamDeclFromOperand(inoutCapture->get());
-    if (param->isSelfParameter())
+    if (isUseOfSelfInInitializer(inoutCapture)) {
       diagnose(Context, PAI->getLoc(), diag::escaping_mutable_self_capture);
-    else {
-      diagnose(Context, PAI->getLoc(), diag::escaping_inout_capture,
-                param->getName());
-      diagnose(Context, param->getLoc(), diag::inout_param_defined_here,
-                param->getName());
+    } else {
+      auto *param = getParamDeclFromOperand(inoutCapture->get());
+      if (param->isSelfParameter())
+        diagnose(Context, PAI->getLoc(), diag::escaping_mutable_self_capture);
+      else {
+        diagnose(Context, PAI->getLoc(), diag::escaping_inout_capture,
+                  param->getName());
+        diagnose(Context, param->getLoc(), diag::inout_param_defined_here,
+                  param->getName());
+      }
     }
 
     diagnoseCaptureLoc(Context, DC, PAI, inoutCapture);

branches/tensorflow-next/test/SILOptimizer/invalid_escaping_captures.swift

@@ -175,4 +175,16 @@ func ~> (x: inout Int, f: @escaping (_: inout Int, _: Target) -> Target) -> (Tar
   // expected-note@-1 {{parameter 'x' is declared 'inout'}}
   return { f(&x, $0) } // expected-note {{captured here}}
   // expected-error@-1 {{escaping closure captures 'inout' parameter 'x'}}
-}
+}
+
+func addHandler(_: @escaping () -> ()) {}
+
+public struct SelfEscapeFromInit {
+  public init() {
+    addHandler { self.handler() }
+    // expected-error@-1 {{escaping closure captures mutating 'self' parameter}}
+    // expected-note@-2 {{captured here}}
+  }
+
+  public mutating func handler() {}
+}