Sema: Availability checking for variadic generic types

slavapestov · slavapestov · commit 91a39717f967 · 2023-05-16T12:17:08.000-04:00
diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
@@ -918,6 +918,10 @@ class ASTContext final {
   /// needed to place array buffers into constant data sections.
   AvailabilityContext getImmortalRefCountSymbolsAvailability();
 
+  /// Get the runtime availability of runtime functions for
+  /// variadic generic types.
+  AvailabilityContext getVariadicGenericTypeAvailability();
+
   /// Get the runtime availability of features introduced in the Swift 5.2
   /// compiler for the target platform.
   AvailabilityContext getSwift52Availability();
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -6143,6 +6143,10 @@ ERROR(availability_parameterized_protocol_only_version_newer, none,
       "%0 %1 or newer",
       (StringRef, llvm::VersionTuple))
 
+ERROR(availability_variadic_type_only_version_newer, none,
+      "parameter packs in generic types are only available in %0 %1 or newer",
+      (StringRef, llvm::VersionTuple))
+
 NOTE(availability_guard_with_version_check, none,
      "add 'if #available' version check", ())
 
diff --git a/lib/AST/Availability.cpp b/lib/AST/Availability.cpp
@@ -517,6 +517,11 @@ ASTContext::getImmortalRefCountSymbolsAvailability() {
   return getSwiftFutureAvailability();
 }
 
+AvailabilityContext
+ASTContext::getVariadicGenericTypeAvailability() {
+  return getSwift59Availability();
+}
+
 AvailabilityContext ASTContext::getSwift52Availability() {
   auto target = LangOpts.Target;
 
diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
@@ -2039,7 +2039,7 @@ bool TypeChecker::checkAvailability(SourceRange ReferenceRange,
     return false;
 
   if (!shouldCheckAvailability(ReferenceDC->getAsDecl()))
-    return;
+    return false;
   
   auto runningOS =
     TypeChecker::overApproximateAvailabilityAtLocation(
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -484,6 +484,12 @@ static void checkGenericParams(GenericContext *ownerCtx) {
         decl->diagnose(diag::experimental_type_with_parameter_pack);
       }
 
+      TypeChecker::checkAvailability(
+          gp->getSourceRange(),
+          ownerCtx->getASTContext().getVariadicGenericTypeAvailability(),
+          diag::availability_variadic_type_only_version_newer,
+          ownerCtx);
+
       if (hasPack) {
         gp->diagnose(diag::more_than_one_pack_in_type);
       }
diff --git a/test/Constraints/one_element_tuple.swift b/test/Constraints/one_element_tuple.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // REQUIRES: asserts
 
diff --git a/test/Constraints/variadic_generic_types.swift b/test/Constraints/variadic_generic_types.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // REQUIRES: asserts
 
diff --git a/test/DebugInfo/variadic-generics-count.swift b/test/DebugInfo/variadic-generics-count.swift
@@ -1,6 +1,6 @@
 // REQUIRES: asserts
 // RUN: %target-swift-frontend -emit-ir %s -g -o - \
-// RUN:    -parse-as-library -module-name a -enable-experimental-feature VariadicGenerics | %FileCheck %s
+// RUN:    -parse-as-library -module-name a -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s
 
 public func f1<each T>(ts: repeat each T) {
   // CHECK: define {{.*}} @"$s1a2f12tsyxxQp_tRvzlF"(%swift.opaque** {{.*}}, i{{32|64}} [[COUNT1_1:.*]], %swift.type** {{.*}})
diff --git a/test/Generics/pack-shape-requirements.swift b/test/Generics/pack-shape-requirements.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -typecheck -enable-experimental-feature VariadicGenerics %s -debug-generic-signatures 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck -enable-experimental-feature VariadicGenerics %s -debug-generic-signatures -disable-availability-checking 2>&1 | %FileCheck %s
 
 // REQUIRES: asserts
 
diff --git a/test/Generics/variadic_generic_requirements.swift b/test/Generics/variadic_generic_requirements.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // REQUIRES: asserts
 
diff --git a/test/Generics/variadic_generic_types.swift b/test/Generics/variadic_generic_types.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/Generics/variadic_generic_types_availability.swift b/test/Generics/variadic_generic_types_availability.swift
@@ -0,0 +1,10 @@
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+
+// Because of -enable-experimental-feature VariadicGenerics
+// REQUIRES: asserts
+
+// REQUIRES: OS=macosx
+
+struct G<each T> {}
+// expected-note@-1 {{add @available attribute to enclosing generic struct}}
+// expected-error@-2 {{parameter packs in generic types are only available in macOS 99.99.0 or newer}}
diff --git a/test/IRGen/pack_archetype_canonicalization.swift b/test/IRGen/pack_archetype_canonicalization.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics
+// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/IRGen/variadic_generic_fulfillment.swift b/test/IRGen/variadic_generic_fulfillment.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics | %FileCheck %s -DINT=i%target-ptrsize
+// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s -DINT=i%target-ptrsize
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/IRGen/variadic_generic_types.swift b/test/IRGen/variadic_generic_types.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %FileCheck %s
+// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/Interpreter/variadic_generic_conformances.swift b/test/Interpreter/variadic_generic_conformances.swift
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics)
+// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-availability-checking)
 
 // REQUIRES: executable_test
 
diff --git a/test/Interpreter/variadic_generic_types.swift b/test/Interpreter/variadic_generic_types.swift
@@ -1,5 +1,5 @@
-// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-concrete-type-metadata-mangled-name-accessors)
-// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics)
+// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-concrete-type-metadata-mangled-name-accessors -Xfrontend -disable-availability-checking)
+// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-availability-checking)
 
 // REQUIRES: executable_test
 
diff --git a/test/ModuleInterface/pack_expansion_type.swift b/test/ModuleInterface/pack_expansion_type.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-emit-module-interface(%t/PackExpansionType.swiftinterface) %s -module-name PackExpansionType -enable-experimental-feature VariadicGenerics
+// RUN: %target-swift-emit-module-interface(%t/PackExpansionType.swiftinterface) %s -module-name PackExpansionType -enable-experimental-feature VariadicGenerics -disable-availability-checking
 // RUN: %FileCheck %s < %t/PackExpansionType.swiftinterface
 
 // Experimental features require an asserts compiler
diff --git a/test/Parse/type_parameter_packs.swift b/test/Parse/type_parameter_packs.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // REQUIRES: asserts
 
diff --git a/test/SILGen/pack_expansion_type.swift b/test/SILGen/pack_expansion_type.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen %s -enable-experimental-feature VariadicGenerics | %FileCheck %s
+// RUN: %target-swift-emit-silgen %s -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s
 
 // Experimental features require an asserts compiler
 // REQUIRES: asserts
diff --git a/test/SILGen/variadic-generic-closures.swift b/test/SILGen/variadic-generic-closures.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics -disable-availability-checking %s | %FileCheck %s
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/SILGen/variadic-generic-tuples.swift b/test/SILGen/variadic-generic-tuples.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics -disable-availability-checking %s | %FileCheck %s
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/SILGen/variadic-generic-vanishing-tuples.swift b/test/SILGen/variadic-generic-vanishing-tuples.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics -disable-availability-checking %s | %FileCheck %s
 
 // rdar://107459964
 // rdar://107478603
diff --git a/test/SILGen/variadic_generic_types.swift b/test/SILGen/variadic_generic_types.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen %s -enable-experimental-feature VariadicGenerics
+// RUN: %target-swift-emit-silgen %s -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/Serialization/pack_expansion_type.swift b/test/Serialization/pack_expansion_type.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend %S/Inputs/pack_expansion_type_other.swift -emit-module -emit-module-path %t/pack_expansion_type_other.swiftmodule -enable-experimental-feature VariadicGenerics
-// RUN: %target-typecheck-verify-swift -I %t -enable-experimental-feature VariadicGenerics
+// RUN: %target-swift-frontend %S/Inputs/pack_expansion_type_other.swift -emit-module -emit-module-path %t/pack_expansion_type_other.swiftmodule -enable-experimental-feature VariadicGenerics -disable-availability-checking
+// RUN: %target-typecheck-verify-swift -I %t -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // Experimental features require an asserts compiler
 // REQUIRES: asserts
diff --git a/test/TypeDecoder/variadic_nominal_types.swift b/test/TypeDecoder/variadic_nominal_types.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 
-// RUN: %target-build-swift -emit-executable %s -g -o %t/variadic_nominal_types -emit-module -enable-experimental-feature VariadicGenerics
+// RUN: %target-build-swift -emit-executable %s -g -o %t/variadic_nominal_types -emit-module -enable-experimental-feature VariadicGenerics -Xfrontend -disable-availability-checking
 
 // RUN: sed -ne '/\/\/ *DEMANGLE-TYPE: /s/\/\/ *DEMANGLE-TYPE: *//p' < %s > %t/input
 // RUN: %lldb-moduleimport-test-with-sdk %t/variadic_nominal_types -type-from-mangled=%t/input | %FileCheck %s --check-prefix=CHECK-TYPE
diff --git a/test/decl/protocol/conforms/variadic_generic_type.swift b/test/decl/protocol/conforms/variadic_generic_type.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // Because of -enable-experimental-feature VariadicGenerics
 // REQUIRES: asserts
diff --git a/test/type/pack_expansion.swift b/test/type/pack_expansion.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
 
 // REQUIRES: asserts
 

Original file line number	Diff line number	Diff line change
`@@ -484,6 +484,12 @@ static void checkGenericParams(GenericContext *ownerCtx) {`
`484`	`484`	`decl->diagnose(diag::experimental_type_with_parameter_pack);`
`485`	`485`	`}`
`486`	`486`
	`487`	`+ TypeChecker::checkAvailability(`
	`488`	`+ gp->getSourceRange(),`
	`489`	`+ ownerCtx->getASTContext().getVariadicGenericTypeAvailability(),`
	`490`	`+ diag::availability_variadic_type_only_version_newer,`
	`491`	`+ ownerCtx);`
	`492`	`+`
`487`	`493`	`if (hasPack) {`
`488`	`494`	`gp->diagnose(diag::more_than_one_pack_in_type);`
`489`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics`
	`1`	`+// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking`
`2`	`2`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -typecheck -enable-experimental-feature VariadicGenerics %s -debug-generic-signatures 2>&1 \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -typecheck -enable-experimental-feature VariadicGenerics %s -debug-generic-signatures -disable-availability-checking 2>&1 \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`