Merge pull request swiftlang#34372 from slavapestov/more-export-context-refactoring

Generalize ExportContext and use it for deprecation and unavailability

Author: slavapestov

include/swift/AST/DeclContext.h

@@ -57,6 +57,7 @@ namespace swift {
   class GenericTypeParamType;
   class InfixOperatorDecl;
   class InfixOperatorLookupResult;
+  enum class PlatformKind: uint8_t;
   class PrecedenceGroupDecl;
   class ProtocolDecl;
   class Requirement;

lib/Sema/TypeCheckAccess.cpp

@@ -1513,7 +1513,7 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
       loc = varDecl->getNameLoc();
 
     diagnoseTypeAvailability(typeRepr, type, loc,
-                             Where.forReason(reason), flags);
+                             Where.withReason(reason), flags);
   }
 
   void checkGenericParams(const GenericContext *ownerCtx,
@@ -1541,8 +1541,8 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
   }
 
 public:
-  explicit DeclAvailabilityChecker(Decl *D)
-    : Where(ExportContext::forDeclSignature(D)) {}
+  explicit DeclAvailabilityChecker(ExportContext where)
+    : Where(where) {}
 
   // Force all kinds to be handled at a lower level.
   void visitDecl(Decl *D) = delete;
@@ -1751,14 +1751,14 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
       return isExported(valueMember);
     });
 
-    Where = wasWhere.forExported(hasExportedMembers);
-    checkType(ED->getExtendedType(),  ED->getExtendedTypeRepr(), ED,
+    Where = wasWhere.withExported(hasExportedMembers);
+    checkType(ED->getExtendedType(), ED->getExtendedTypeRepr(), ED,
               ExportabilityReason::ExtensionWithPublicMembers);
 
     // 3) If the extension contains exported members or defines conformances,
     // the 'where' clause must only name exported types.
-    Where = wasWhere.forExported(hasExportedMembers ||
-                                 !ED->getInherited().empty());
+    Where = wasWhere.withExported(hasExportedMembers ||
+                                  !ED->getInherited().empty());
     checkConstrainedExtensionRequirements(ED, hasExportedMembers);
   }
 
@@ -1857,9 +1857,12 @@ void swift::checkAccessControl(Decl *D) {
     checkExtensionGenericParamAccess(ED);
   }
 
-  //ExportabilityChecker().visit(D);
-  if (D->isImplicit() || isa<AccessorDecl>(D))
+  if (isa<AccessorDecl>(D))
     return;
 
-  DeclAvailabilityChecker(D).visit(D);
+  auto where = ExportContext::forDeclSignature(D);
+  if (where.isImplicit())
+    return;
+
+  DeclAvailabilityChecker(where).visit(D);
 }

lib/Sema/TypeCheckAttr.cpp

@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MiscDiagnostics.h"
+#include "TypeCheckAvailability.h"
 #include "TypeCheckConcurrency.h"
 #include "TypeCheckObjC.h"
 #include "TypeCheckType.h"
@@ -1987,6 +1988,9 @@ SynthesizeMainFunctionRequest::evaluate(Evaluator &evaluator,
     mainFunction = viableCandidates[0];
   }
 
+  auto where = ExportContext::forDeclSignature(D);
+  diagnoseDeclAvailability(mainFunction, attr->getRange(), where, None);
+
   auto *const func = FuncDecl::createImplicit(
       context, StaticSpellingKind::KeywordStatic,
       DeclName(context, DeclBaseName(context.Id_MainEntryPoint),