Sema: Pull conformance exportability checking out of resolveType()

Author: slavapestov

lib/Sema/TypeCheckAccess.cpp

@@ -2071,8 +2071,7 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
 
     // Check the type for references to unavailable conformances.
     if (type)
-      if (!context->getDeclContext()->isLocalContext())
-        diagnoseTypeAvailability(type, context->getLoc(), DC);
+      diagnoseTypeAvailability(type, context->getLoc(), DC);
   }
 
   void checkGenericParams(const GenericContext *ownerCtx,

lib/Sema/TypeCheckAvailability.cpp

@@ -2458,6 +2458,20 @@ class AvailabilityWalker : public ASTWalker {
       walkInOutExpr(IO);
       return skipChildren();
     }
+    if (auto T = dyn_cast<TypeExpr>(E)) {
+      if (!T->isImplicit())
+        if (auto type = T->getType())
+          diagnoseTypeAvailability(type, E->getLoc(), DC);
+    }
+    if (auto CE = dyn_cast<ClosureExpr>(E)) {
+      for (auto *param : *CE->getParameters()) {
+        diagnoseTypeAvailability(param->getInterfaceType(), E->getLoc(), DC);
+      }
+      diagnoseTypeAvailability(CE->getResultType(), E->getLoc(), DC);
+    }
+    if (auto IE = dyn_cast<IsExpr>(E)) {
+      diagnoseTypeAvailability(IE->getCastType(), E->getLoc(), DC);
+    }
 
     return visitChildren();
   }
@@ -2894,6 +2908,14 @@ class StmtAvailabilityWalker : public ASTWalker {
     diagnoseTypeReprAvailability(T, DC);
     return false;
   }
+
+  std::pair<bool, Pattern *> walkToPatternPre(Pattern *P) override {
+    if (auto *IP = dyn_cast<IsPattern>(P))
+      if (auto T = IP->getCastType())
+        diagnoseTypeAvailability(T, P->getLoc(), DC);
+
+    return std::make_pair(true, P);
+  }
 };
 
 }

lib/Sema/TypeCheckType.cpp

@@ -813,13 +813,6 @@ static Type applyGenericArguments(Type type, TypeResolution resolution,
   const auto result = TypeChecker::applyUnboundGenericArguments(
       decl, unboundType->getParent(), loc, resolution, args);
 
-  const auto genericOptions = genericResolution.getOptions();
-  if (!genericOptions.contains(TypeResolutionFlags::AllowUnavailable)) {
-    if (genericOptions.isAnyExpr() || dc->getParent()->isLocalContext())
-      if (dc->getResilienceExpansion() == ResilienceExpansion::Minimal)
-        TypeChecker::diagnoseGenericTypeExportability(loc, result, dc);
-  }
-
   // Migration hack.
   bool isMutablePointer;
   if (isPointerToVoid(dc->getASTContext(), result, isMutablePointer)) {

test/Sema/implementation-only-import-inlinable-conformances.swift

@@ -33,7 +33,7 @@ public struct NormalProtoAssocHolder<T: NormalProto> {
   _ = x
   // FIXME: We get this error twice: once for the TypeExpr and once for the implicit init.
   _ = NormalProtoAssocHolder<NormalStruct>() // expected-error 2 {{cannot use conformance of 'NormalStruct' to 'NormalProto' here; 'BADLibrary' has been imported as implementation-only}}
-  _ = NormalProtoAssocHolder(nil as NormalStruct?) // expected-error {{cannot use conformance of 'NormalStruct' to 'NormalProto' here; 'BADLibrary' has been imported as implementation-only}}
+  _ = NormalProtoAssocHolder(nil as NormalStruct?) // expected-error 2{{cannot use conformance of 'NormalStruct' to 'NormalProto' here; 'BADLibrary' has been imported as implementation-only}}
 }
 
 func internalConformanceInBoundGeneric() {

test/Sema/spi-inlinable-conformances.swift

@@ -67,7 +67,7 @@ public struct NormalProtoAssocHolder<T: NormalProto> {
   _ = x
   // FIXME: We get this error twice: once for the TypeExpr and once for the implicit init.
   _ = NormalProtoAssocHolder<NormalStruct>() // expected-error 2 {{cannot use conformance of 'NormalStruct' to 'NormalProto' here; the conformance is declared as SPI}}
-  _ = NormalProtoAssocHolder(nil as NormalStruct?) // expected-error {{cannot use conformance of 'NormalStruct' to 'NormalProto' here; the conformance is declared as SPI}}
+  _ = NormalProtoAssocHolder(nil as NormalStruct?) // expected-error 2{{cannot use conformance of 'NormalStruct' to 'NormalProto' here; the conformance is declared as SPI}}
 }
 
 @_spi(AcceptInSPI)