Merge pull request #77442 from tshortli/disable-availability-checking

Author: tshortli

lib/Sema/TypeCheckAvailability.cpp

@@ -238,10 +238,8 @@ ExportContext ExportContext::forDeclSignature(Decl *D) {
 
   auto *DC = D->getInnermostDeclContext();
   auto fragileKind = DC->getFragileFunctionKind();
-  auto availabilityContext =
-      (Ctx.LangOpts.DisableAvailabilityChecking
-           ? AvailabilityContext::getDefault(Ctx)
-           : TypeChecker::availabilityAtLocation(D->getLoc(), DC));
+  auto loc = D->getLoc();
+  auto availabilityContext = TypeChecker::availabilityAtLocation(loc, DC);
   bool spi = Ctx.LangOpts.LibraryLevel == LibraryLevel::SPI;
   bool implicit = false;
   computeExportContextBits(Ctx, D, &spi, &implicit);
@@ -259,10 +257,7 @@ ExportContext ExportContext::forFunctionBody(DeclContext *DC, SourceLoc loc) {
   auto &Ctx = DC->getASTContext();
 
   auto fragileKind = DC->getFragileFunctionKind();
-  auto availabilityContext =
-      (Ctx.LangOpts.DisableAvailabilityChecking
-           ? AvailabilityContext::getDefault(Ctx)
-           : TypeChecker::availabilityAtLocation(loc, DC));
+  auto availabilityContext = TypeChecker::availabilityAtLocation(loc, DC);
   bool spi = Ctx.LangOpts.LibraryLevel == LibraryLevel::SPI;
   bool implicit = false;
   forEachOuterDecl(
@@ -1075,6 +1070,8 @@ class TypeRefinementContextBuilder : private ASTWalker {
   std::pair<std::optional<AvailabilityRange>,
             std::optional<AvailabilityRange>>
   buildStmtConditionRefinementContext(StmtCondition Cond) {
+    if (Context.LangOpts.DisableAvailabilityChecking)
+      return {};
 
     // Any refinement contexts introduced in the statement condition
     // will end at the end of the last condition element.
@@ -1346,8 +1343,18 @@ class TypeRefinementContextBuilder : private ASTWalker {
 } // end anonymous namespace
 
 void TypeChecker::buildTypeRefinementContextHierarchy(SourceFile &SF) {
+  switch (SF.Kind) {
+  case SourceFileKind::SIL:
+    // SIL doesn't support availability queries.
+    return;
+  case SourceFileKind::MacroExpansion:
+  case SourceFileKind::DefaultArgument:
+  case SourceFileKind::Library:
+  case SourceFileKind::Main:
+  case SourceFileKind::Interface:
+    break;
+  }
   ASTContext &Context = SF.getASTContext();
-  assert(!Context.LangOpts.DisableAvailabilityChecking);
 
   // If there's already a root node, then we're done.
   if (SF.getTypeRefinementContext())
@@ -1376,9 +1383,6 @@ void TypeChecker::buildTypeRefinementContextHierarchy(SourceFile &SF) {
 
 TypeRefinementContext *
 TypeChecker::getOrBuildTypeRefinementContext(SourceFile *SF) {
-  if (SF->getASTContext().LangOpts.DisableAvailabilityChecking)
-    return nullptr;
-
   TypeRefinementContext *TRC = SF->getTypeRefinementContext();
   if (!TRC) {
     buildTypeRefinementContextHierarchy(*SF);

lib/Sema/TypeChecker.cpp

@@ -276,11 +276,9 @@ TypeCheckSourceFileRequest::evaluate(Evaluator &eval, SourceFile *SF) const {
     FrontendStatsTracer tracer(Ctx.Stats,
                                "Type checking and Semantic analysis");
 
-    if (!Ctx.LangOpts.DisableAvailabilityChecking) {
-      // Build the type refinement hierarchy for the primary
-      // file before type checking.
-      TypeChecker::buildTypeRefinementContextHierarchy(*SF);
-    }
+    // Build the type refinement hierarchy for the primary
+    // file before type checking.
+    TypeChecker::buildTypeRefinementContextHierarchy(*SF);
 
     // Type check the top-level elements of the source file.
     for (auto D : SF->getTopLevelDecls()) {

test/ModuleInterface/sil-opt-availability.swift

@@ -0,0 +1,13 @@
+// RUN: %target-swift-frontend -emit-module %s -enable-library-evolution -swift-version 5 -module-name Library -emit-module-interface-path %t/Library.swiftinterface -o %t/Library.swiftmodule
+
+// RUN: echo "import Library" > %t/Client.swift
+// RUN: %target-swift-frontend -emit-module %t/Client.swift -module-name Client -o %t/Client.swiftmodule -I %t
+
+// RUN: rm %t/Library.swiftmodule
+// RUN: %target-sil-opt -enable-sil-verify-all %t/Client.swiftmodule -module-name Client
+
+@available(*, unavailable)
+public struct Unavailable {}
+
+@available(*, unavailable)
+public func usesUnavailable(_ u: Unavailable) {}

test/Sema/availability.swift

@@ -86,15 +86,3 @@ struct DeferBody {
     // expected-error@-1 {{'No' is unavailable}}
   }
 }
-
-struct NotP {}
-
-protocol P {}
-
-@available(*, unavailable)
-extension NotP: P {} // expected-note {{conformance of 'NotP' to 'P' has been explicitly marked unavailable here}}
-
-@available(SwiftStdlib 5.1, *)
-func requireP() -> some P {
-  NotP() // expected-error {{conformance of 'NotP' to 'P' is unavailable}}
-}

test/type/opaque_availability.swift

@@ -1,13 +1,21 @@
-// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.9 -typecheck -verify %s
-// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.15 -typecheck %s
+// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.9 -typecheck %s -verify -verify-additional-prefix only-available-
+// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.15 -typecheck %s -verify
 // REQUIRES: OS=macosx
 
 protocol P {}
 struct X: P {}
 
-func alwaysOpaque() -> some P { return X() } // expected-error{{'some' return types are only available}} expected-note{{add @available}}
+func alwaysOpaque() -> some P { return X() } // expected-only-available-error{{'some' return types are only available}} expected-only-available-note{{add @available}}
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 func sometimesOpaque() -> some P { return X() }
 
+struct NotP {}
 
+@available(*, unavailable)
+extension NotP: P {} // expected-note {{conformance of 'NotP' to 'P' has been explicitly marked unavailable here}}
+
+@available(SwiftStdlib 5.1, *)
+func requireP() -> some P {
+  NotP() // expected-error {{conformance of 'NotP' to 'P' is unavailable}}
+}