Sema: Check declaration attributes before checking members

slavapestov · slavapestov · commit 7bc50889f450 · 2020-07-08T21:38:34.000-04:00
This simplifies matters if checking an attribute adds members
to the nominal type or extension.
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -1884,9 +1884,6 @@ SynthesizeMainFunctionRequest::evaluate(Evaluator &evaluator,
     return nullptr;
   }
 
-  SourceFile *file = cast<SourceFile>(declContext->getModuleScopeContext());
-  assert(file);
-
   // Create a function
   //
   //     func $main() {
@@ -1954,28 +1951,6 @@ SynthesizeMainFunctionRequest::evaluate(Evaluator &evaluator,
 
   iterableDeclContext->addMember(func);
 
-  // This function must be type-checked. Why?  Consider the following scenario:
-  //
-  //     protocol AlmostMainable {}
-  //     protocol ReallyMainable {}
-  //     extension AlmostMainable where Self : ReallyMainable {
-  //         static func main() {}
-  //     }
-  //     @main struct Main : AlmostMainable {}
-  //
-  // Note in particular that Main does not conform to ReallyMainable.
-  //
-  // In this case, resolveValueMember will find the function main in the 
-  // extension, and so, since there is one candidate, the function $main will
-  // accordingly be formed as usual:
-  //
-  //     func $main() {
-  //         return Main.main()
-  //     }
-  //
-  // Of course, this function's body does not type-check.
-  file->DelayedFunctions.push_back(func);
-
   return func;
 }
 
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -1797,13 +1797,13 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     checkGenericParams(ED);
 
     // Check for circular inheritance of the raw type.
-    (void)ED->hasCircularRawValue();
+    (void) ED->hasCircularRawValue();
+
+    TypeChecker::checkDeclAttributes(ED);
 
     for (Decl *member : ED->getMembers())
       visit(member);
 
-    TypeChecker::checkDeclAttributes(ED);
-
     checkInheritanceClause(ED);
 
     checkAccessControl(ED);
@@ -1845,13 +1845,13 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     installCodingKeysIfNecessary(SD);
 
+    TypeChecker::checkDeclAttributes(SD);
+
     for (Decl *Member : SD->getMembers())
       visit(Member);
 
     TypeChecker::checkPatternBindingCaptures(SD);
 
-    TypeChecker::checkDeclAttributes(SD);
-
     checkInheritanceClause(SD);
 
     checkAccessControl(SD);
@@ -1974,6 +1974,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Force creation of an implicit destructor, if any.
     (void) CD->getDestructor();
 
+    TypeChecker::checkDeclAttributes(CD);
+
     for (Decl *Member : CD->getEmittedMembers())
       visit(Member);
 
@@ -2084,8 +2086,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       }
     }
 
-    TypeChecker::checkDeclAttributes(CD);
-
     checkInheritanceClause(CD);
 
     checkAccessControl(CD);
@@ -2105,12 +2105,12 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Check for circular inheritance within the protocol.
     (void)PD->hasCircularInheritedProtocols();
 
+    TypeChecker::checkDeclAttributes(PD);
+
     // Check the members.
     for (auto Member : PD->getMembers())
       visit(Member);
 
-    TypeChecker::checkDeclAttributes(PD);
-
     checkAccessControl(PD);
 
     checkInheritanceClause(PD);
@@ -2428,14 +2428,15 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     checkGenericParams(ED);
 
+    TypeChecker::checkDeclAttributes(ED);
+
     for (Decl *Member : ED->getMembers())
       visit(Member);
 
     TypeChecker::checkPatternBindingCaptures(ED);
 
     TypeChecker::checkConformancesInContext(ED);
 
-    TypeChecker::checkDeclAttributes(ED);
     checkAccessControl(ED);
 
     checkExplicitAvailability(ED);
diff --git a/test/Compatibility/accessibility.swift b/test/Compatibility/accessibility.swift
@@ -107,7 +107,7 @@ private extension PublicStruct {
   private func extImplPrivate() {}
 }
 public extension InternalStruct { // expected-error {{extension of internal struct cannot be declared public}} {{1-8=}}
-  public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
+  public func extMemberPublic() {}
   fileprivate func extFuncPublic() {}
   private func extImplPublic() {}
 }
@@ -127,12 +127,12 @@ private extension InternalStruct {
   private func extImplPrivate() {}
 }
 public extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared public}} {{1-8=}}
-  public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
+  public func extMemberPublic() {}
   fileprivate func extFuncPublic() {}
   private func extImplPublic() {}
 }
 internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}
+  public func extMemberInternal() {}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
@@ -147,18 +147,18 @@ private extension FilePrivateStruct {
   private func extImplPrivate() {}
 }
 public extension PrivateStruct { // expected-error {{extension of private struct cannot be declared public}} {{1-8=}}
-  public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
+  public func extMemberPublic() {}
   fileprivate func extFuncPublic() {}
   private func extImplPublic() {}
 }
 internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}
+  public func extMemberInternal() {}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}
-  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{none}}
-  fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
+  public func extMemberFilePrivate() {}
+  fileprivate func extFuncFilePrivate() {}
   private func extImplFilePrivate() {}
 }
 private extension PrivateStruct {
diff --git a/test/Sema/accessibility.swift b/test/Sema/accessibility.swift
@@ -106,7 +106,7 @@ private extension PublicStruct {
   private func extImplPrivate() {}
 }
 public extension InternalStruct { // expected-error {{extension of internal struct cannot be declared public}} {{1-8=}}
-  public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
+  public func extMemberPublic() {}
   fileprivate func extFuncPublic() {}
   private func extImplPublic() {}
 }
@@ -126,12 +126,12 @@ private extension InternalStruct {
   private func extImplPrivate() {}
 }
 public extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared public}} {{1-8=}}
-  public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
+  public func extMemberPublic() {}
   fileprivate func extFuncPublic() {}
   private func extImplPublic() {}
 }
 internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}
+  public func extMemberInternal() {}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
@@ -146,18 +146,18 @@ private extension FilePrivateStruct {
   private func extImplPrivate() {}
 }
 public extension PrivateStruct { // expected-error {{extension of private struct cannot be declared public}} {{1-8=}}
-  public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}
+  public func extMemberPublic() {}
   fileprivate func extFuncPublic() {}
   private func extImplPublic() {}
 }
 internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}
-  public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}
+  public func extMemberInternal() {}
   fileprivate func extFuncInternal() {}
   private func extImplInternal() {}
 }
 fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}
-  public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{none}}
-  fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}
+  public func extMemberFilePrivate() {}
+  fileprivate func extFuncFilePrivate() {}
   private func extImplFilePrivate() {}
 }
 private extension PrivateStruct {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private extension PublicStruct {`
`107`	`107`	`private func extImplPrivate() {}`
`108`	`108`	`}`
`109`	`109`	`public extension InternalStruct { // expected-error {{extension of internal struct cannot be declared public}} {{1-8=}}`
`110`		`- public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}`
	`110`	`+ public func extMemberPublic() {}`
`111`	`111`	`fileprivate func extFuncPublic() {}`
`112`	`112`	`private func extImplPublic() {}`
`113`	`113`	`}`
`@@ -127,12 +127,12 @@ private extension InternalStruct {`
`127`	`127`	`private func extImplPrivate() {}`
`128`	`128`	`}`
`129`	`129`	`public extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared public}} {{1-8=}}`
`130`		`- public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}`
	`130`	`+ public func extMemberPublic() {}`
`131`	`131`	`fileprivate func extFuncPublic() {}`
`132`	`132`	`private func extImplPublic() {}`
`133`	`133`	`}`
`134`	`134`	`internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}`
`135`		`- public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}`
	`135`	`+ public func extMemberInternal() {}`
`136`	`136`	`fileprivate func extFuncInternal() {}`
`137`	`137`	`private func extImplInternal() {}`
`138`	`138`	`}`
`@@ -147,18 +147,18 @@ private extension FilePrivateStruct {`
`147`	`147`	`private func extImplPrivate() {}`
`148`	`148`	`}`
`149`	`149`	`public extension PrivateStruct { // expected-error {{extension of private struct cannot be declared public}} {{1-8=}}`
`150`		`- public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}`
	`150`	`+ public func extMemberPublic() {}`
`151`	`151`	`fileprivate func extFuncPublic() {}`
`152`	`152`	`private func extImplPublic() {}`
`153`	`153`	`}`
`154`	`154`	`internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}`
`155`		`- public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}`
	`155`	`+ public func extMemberInternal() {}`
`156`	`156`	`fileprivate func extFuncInternal() {}`
`157`	`157`	`private func extImplInternal() {}`
`158`	`158`	`}`
`159`	`159`	`fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}`
`160`		`- public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{none}}`
`161`		`- fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
	`160`	`+ public func extMemberFilePrivate() {}`
	`161`	`+ fileprivate func extFuncFilePrivate() {}`
`162`	`162`	`private func extImplFilePrivate() {}`
`163`	`163`	`}`
`164`	`164`	`private extension PrivateStruct {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private extension PublicStruct {`
`106`	`106`	`private func extImplPrivate() {}`
`107`	`107`	`}`
`108`	`108`	`public extension InternalStruct { // expected-error {{extension of internal struct cannot be declared public}} {{1-8=}}`
`109`		`- public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}`
	`109`	`+ public func extMemberPublic() {}`
`110`	`110`	`fileprivate func extFuncPublic() {}`
`111`	`111`	`private func extImplPublic() {}`
`112`	`112`	`}`
`@@ -126,12 +126,12 @@ private extension InternalStruct {`
`126`	`126`	`private func extImplPrivate() {}`
`127`	`127`	`}`
`128`	`128`	`public extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared public}} {{1-8=}}`
`129`		`- public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}`
	`129`	`+ public func extMemberPublic() {}`
`130`	`130`	`fileprivate func extFuncPublic() {}`
`131`	`131`	`private func extImplPublic() {}`
`132`	`132`	`}`
`133`	`133`	`internal extension FilePrivateStruct { // expected-error {{extension of fileprivate struct cannot be declared internal}} {{1-10=}}`
`134`		`- public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}`
	`134`	`+ public func extMemberInternal() {}`
`135`	`135`	`fileprivate func extFuncInternal() {}`
`136`	`136`	`private func extImplInternal() {}`
`137`	`137`	`}`
`@@ -146,18 +146,18 @@ private extension FilePrivateStruct {`
`146`	`146`	`private func extImplPrivate() {}`
`147`	`147`	`}`
`148`	`148`	`public extension PrivateStruct { // expected-error {{extension of private struct cannot be declared public}} {{1-8=}}`
`149`		`- public func extMemberPublic() {} // expected-warning {{'public' modifier is redundant for instance method declared in a public extension}} {{3-10=}}`
	`149`	`+ public func extMemberPublic() {}`
`150`	`150`	`fileprivate func extFuncPublic() {}`
`151`	`151`	`private func extImplPublic() {}`
`152`	`152`	`}`
`153`	`153`	`internal extension PrivateStruct { // expected-error {{extension of private struct cannot be declared internal}} {{1-10=}}`
`154`		`- public func extMemberInternal() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'internal'}} {{none}}`
	`154`	`+ public func extMemberInternal() {}`
`155`	`155`	`fileprivate func extFuncInternal() {}`
`156`	`156`	`private func extImplInternal() {}`
`157`	`157`	`}`
`158`	`158`	`fileprivate extension PrivateStruct { // expected-error {{extension of private struct cannot be declared fileprivate}} {{1-13=}}`
`159`		`- public func extMemberFilePrivate() {} // expected-warning {{'public' modifier conflicts with extension's default access of 'fileprivate'}} {{none}}`
`160`		`- fileprivate func extFuncFilePrivate() {} // expected-warning {{'fileprivate' modifier is redundant for instance method declared in a fileprivate extension}} {{3-15=}}`
	`159`	`+ public func extMemberFilePrivate() {}`
	`160`	`+ fileprivate func extFuncFilePrivate() {}`
`161`	`161`	`private func extImplFilePrivate() {}`
`162`	`162`	`}`
`163`	`163`	`private extension PrivateStruct {`