---

yaml
---
r: 344059
b: refs/heads/master-rebranch
c: d3a4f3d
h: refs/heads/master
i:
  344057: 791cc5a
  344055: 1a7f4a3

Author: slavapestov

[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: e1e6f0e7ba89bd7a1e369a291bf419cf250919d5
+refs/heads/master-rebranch: d3a4f3ded088448a57407462dc34661a8aa1b2b4
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/include/swift/AST/DiagnosticsSema.def

@@ -2655,6 +2655,8 @@ ERROR(dynamic_self_invalid_method,none,
       "covariant 'Self' can only appear at the top level of method result type", ())
 ERROR(dynamic_self_stored_property_init,none,
       "covariant 'Self' type cannot be referenced from a stored property initializer", ())
+ERROR(dynamic_self_default_arg,none,
+      "covariant 'Self' type cannot be referenced from a default argument expression", ())
 
 //------------------------------------------------------------------------------
 // MARK: Type Check Attributes

branches/master-rebranch/lib/Sema/TypeCheckCaptures.cpp

@@ -624,6 +624,11 @@ void TypeChecker::computeCaptures(AnyFunctionRef AFR) {
                                 /*isObjC=*/false);
         E->walk(finder);
 
+        if (finder.getDynamicSelfCaptureLoc().isValid()) {
+          Context.Diags.diagnose(finder.getDynamicSelfCaptureLoc(),
+                                 diag::dynamic_self_default_arg);
+        }
+
         auto captures = finder.getCaptureInfo();
         if (isGeneric)
           captures.setGenericParamCaptures(true);

branches/master-rebranch/test/decl/func/dynamic_self.swift

@@ -437,3 +437,11 @@ class Iterable : Sequence {
     return DummyIterator()
   }
 }
+
+// Default arguments of methods cannot capture 'Self' or 'self'
+class MathClass {
+  func invalidDefaultArg(s: Int = Self.intMethod()) {}
+  // expected-error@-1 {{covariant 'Self' type cannot be referenced from a default argument expression}}
+
+  static func intMethod() -> Int { return 0 }
+}