Sema: Stored properties cannot have DynamicSelfType

Author: slavapestov

include/swift/AST/DiagnosticsSema.def

@@ -2581,6 +2581,8 @@ ERROR(dynamic_self_invalid,none,
       "did you mean '%0'?", (StringRef))
 ERROR(dynamic_self_in_mutable_property,none,
       "mutable property cannot have covariant 'Self' type", ())
+ERROR(dynamic_self_in_stored_property,none,
+      "stored property cannot have covariant 'Self' type", ())
 ERROR(dynamic_self_in_mutable_subscript,none,
       "mutable subscript cannot have covariant 'Self' type", ())
 ERROR(dynamic_self_invalid_property,none,

lib/Sema/TypeCheckDecl.cpp

@@ -2376,9 +2376,11 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     if (VD->getDeclContext()->getSelfClassDecl()) {
       checkDynamicSelfType(VD, VD->getValueInterfaceType());
 
-      if (VD->getValueInterfaceType()->hasDynamicSelfType() &&
-          VD->isSettable(nullptr)) {
-        VD->diagnose(diag::dynamic_self_in_mutable_property);
+      if (VD->getValueInterfaceType()->hasDynamicSelfType()) {
+        if (VD->hasStorage())
+          VD->diagnose(diag::dynamic_self_in_stored_property);
+        else if (VD->isSettable(nullptr))
+          VD->diagnose(diag::dynamic_self_in_mutable_property);
       }
     }
 

test/type/self.swift

@@ -139,8 +139,11 @@ class C {
   func j() -> Self.Type {}
   // expected-error@-1 {{covariant 'Self' can only appear at the top level of method result type}}
 
-  let p0: Self?
-  var p1: Self? // expected-error {{mutable property cannot have covariant 'Self' type}}
+  let p0: Self? // expected-error {{stored property cannot have covariant 'Self' type}}
+  var p1: Self? // expected-error {{stored property cannot have covariant 'Self' type}}
+
+  static func staticFunc() -> Self {}
+  let stored: Self = Self.staticFunc() // expected-error {{stored property cannot have covariant 'Self' type}}
 
   var prop: Self { // expected-error {{mutable property cannot have covariant 'Self' type}}
     get {