Run checkPatternBindingCaptures on Extensions

Resolves rdar://57348897

Author: CodaFi

lib/Sema/TypeCheckCaptures.cpp

@@ -660,10 +660,8 @@ static bool isLazy(PatternBindingDecl *PBD) {
   return false;
 }
 
-void TypeChecker::checkPatternBindingCaptures(NominalTypeDecl *typeDecl) {
-  auto &ctx = typeDecl->getASTContext();
-
-  for (auto member : typeDecl->getMembers()) {
+void TypeChecker::checkPatternBindingCaptures(IterableDeclContext *DC) {
+  for (auto member : DC->getMembers()) {
     // Ignore everything other than PBDs.
     auto *PBD = dyn_cast<PatternBindingDecl>(member);
     if (!PBD) continue;

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2265,6 +2265,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     for (Decl *Member : ED->getMembers())
       visit(Member);
 
+    TypeChecker::checkPatternBindingCaptures(ED);
+
     TypeChecker::checkConformancesInContext(ED, ED);
 
     TypeChecker::checkDeclAttributes(ED);

lib/Sema/TypeChecker.h

@@ -1046,7 +1046,7 @@ class TypeChecker final {
   static void computeCaptures(AnyFunctionRef AFR);
 
   /// Check for invalid captures from stored property initializers.
-  static void checkPatternBindingCaptures(NominalTypeDecl *typeDecl);
+  static void checkPatternBindingCaptures(IterableDeclContext *DC);
 
   /// Change the context of closures in the given initializer
   /// expression to the given context.

test/type/self.swift

@@ -162,6 +162,13 @@ class C {
   }
 }
 
+extension C {
+  static var rdar57188331 = Self.staticFunc() // expected-error {{covariant 'Self' type cannot be referenced from a stored property initializer}} expected-error {{stored property cannot have covariant 'Self' type}}
+  static var rdar57188331Var = ""
+  static let rdar57188331Ref = UnsafeRawPointer(&Self.rdar57188331Var) // expected-error {{covariant 'Self' type cannot be referenced from a stored property initializer}}
+}
+
+
 struct S1 {
   typealias _SELF = Self
   let j = 99.1