[Sema] Make getDisallowedOriginKind usable to other source files

Author: xymus

lib/Sema/TypeCheckAccess.cpp

@@ -1454,47 +1454,40 @@ class UsableFromInlineChecker : public AccessControlCheckerBase,
   }
 };
 
+/// Returns the kind of origin, implementation-only import or SPI declaration,
+/// that restricts exporting \p decl from the given file and context.
+///
+/// Local variant to swift::getDisallowedOriginKind for downgrade to warnings.
+DisallowedOriginKind
+getDisallowedOriginKind(const Decl *decl,
+                        const SourceFile &userSF,
+                        const Decl *userContext,
+                        DowngradeToWarning &downgradeToWarning) {
+  downgradeToWarning = DowngradeToWarning::No;
+  ModuleDecl *M = decl->getModuleContext();
+  if (userSF.isImportedImplementationOnly(M)) {
+    // Temporarily downgrade implementation-only exportability in SPI to
+    // a warning.
+    if (userContext->isSPI())
+      downgradeToWarning = DowngradeToWarning::Yes;
+
+    // Implementation-only imported, cannot be reexported.
+    return DisallowedOriginKind::ImplementationOnly;
+  } else if (decl->isSPI() && !userContext->isSPI()) {
+    // SPI can only be exported in SPI.
+    return userContext->getModuleContext() == M ?
+      DisallowedOriginKind::SPILocal :
+      DisallowedOriginKind::SPIImported;
+  }
+
+  return DisallowedOriginKind::None;
+};
+
 // Diagnose public APIs exposing types that are either imported as
 // implementation-only or declared as SPI.
 class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
   class Diagnoser;
 
-  // Problematic origin of an exported type.
-  //
-  // This enum must be kept in sync with
-  // diag::decl_from_hidden_module and
-  // diag::conformance_from_implementation_only_module.
-  enum class DisallowedOriginKind : uint8_t {
-    ImplementationOnly,
-    SPIImported,
-    SPILocal,
-    None
-  };
-
-  // If there's an exportability problem with \p typeDecl, get its origin kind.
-  static DisallowedOriginKind getDisallowedOriginKind(
-      const TypeDecl *typeDecl, const SourceFile &SF, const Decl *context,
-      DowngradeToWarning &downgradeToWarning) {
-    downgradeToWarning = DowngradeToWarning::No;
-    ModuleDecl *M = typeDecl->getModuleContext();
-    if (SF.isImportedImplementationOnly(M)) {
-      // Temporarily downgrade implementation-only exportability in SPI to
-      // a warning.
-      if (context->isSPI())
-        downgradeToWarning = DowngradeToWarning::Yes;
-
-      // Implementation-only imported, cannot be reexported.
-      return DisallowedOriginKind::ImplementationOnly;
-    } else if (typeDecl->isSPI() && !context->isSPI()) {
-      // SPI can only be exported in SPI.
-      return context->getModuleContext() == M ?
-        DisallowedOriginKind::SPILocal :
-        DisallowedOriginKind::SPIImported;
-    }
-
-    return DisallowedOriginKind::None;
-  };
-
   void checkTypeImpl(
       Type type, const TypeRepr *typeRepr, const SourceFile &SF,
       const Decl *context,
@@ -2067,6 +2060,13 @@ static void checkExtensionGenericParamAccess(const ExtensionDecl *ED) {
       ED, ED, desiredAccessScope, userSpecifiedAccess);
 }
 
+DisallowedOriginKind swift::getDisallowedOriginKind(const Decl *decl,
+                                                    const SourceFile &userSF,
+                                                    const Decl *declContext) {
+  auto downgradeToWarning = DowngradeToWarning::No;
+  return getDisallowedOriginKind(decl, userSF, declContext, downgradeToWarning);
+}
+
 void swift::checkAccessControl(Decl *D) {
   if (isa<ValueDecl>(D) || isa<PatternBindingDecl>(D)) {
     AccessControlChecker().visit(D);

lib/Sema/TypeCheckAccess.h

@@ -17,9 +17,12 @@
 #ifndef TYPECHECKACCESS_H
 #define TYPECHECKACCESS_H
 
+#include <cstdint>
+
 namespace swift {
 
 class Decl;
+class SourceFile;
 
 /// Performs access-related checks for \p D.
 ///
@@ -28,6 +31,24 @@ class Decl;
 /// itself. Related checks may also be performed.
 void checkAccessControl(Decl *D);
 
+// Problematic origin of an exported type.
+//
+// This enum must be kept in sync with
+// diag::decl_from_hidden_module and
+// diag::conformance_from_implementation_only_module.
+enum class DisallowedOriginKind : uint8_t {
+  ImplementationOnly,
+  SPIImported,
+  SPILocal,
+  None
+};
+
+/// Returns the kind of origin, implementation-only import or SPI declaration,
+/// that restricts exporting \p decl from the given file and context.
+DisallowedOriginKind getDisallowedOriginKind(const Decl *decl,
+                                             const SourceFile &userSF,
+                                             const Decl *userContext);
+
 } // end namespace swift
 
 #endif