[NFC] Style/assertion/test design improvements

Author: beccadax

lib/AST/Attr.cpp

@@ -131,8 +131,8 @@ DeclAttributes::isUnavailableInSwiftVersion(
   return false;
 }
 
-const AvailableAttr *DeclAttributes::getPotentiallyUnavailable(
-                          const ASTContext &ctx) const {
+const AvailableAttr *
+DeclAttributes::getPotentiallyUnavailable(const ASTContext &ctx) const {
   const AvailableAttr *potential = nullptr;
   const AvailableAttr *conditional = nullptr;
 
@@ -151,20 +151,20 @@ const AvailableAttr *DeclAttributes::getPotentiallyUnavailable(
         return AvAttr;
 
       switch (AvAttr->getVersionAvailability(ctx)) {
-        case AvailableVersionComparison::Available:
-          // Doesn't limit the introduced version.
-          break;
-
-        case AvailableVersionComparison::PotentiallyUnavailable:
-          // We'll return this if we don't see something that proves it's
-          // not available in this version.
-          potential = AvAttr;
-          break;
-
-        case AvailableVersionComparison::Unavailable:
-        case AvailableVersionComparison::Obsoleted:
-          conditional = AvAttr;
-          break;
+      case AvailableVersionComparison::Available:
+        // Doesn't limit the introduced version.
+        break;
+
+      case AvailableVersionComparison::PotentiallyUnavailable:
+        // We'll return this if we don't see something that proves it's
+        // not available in this version.
+        potential = AvAttr;
+        break;
+
+      case AvailableVersionComparison::Unavailable:
+      case AvailableVersionComparison::Obsoleted:
+        conditional = AvAttr;
+        break;
       }
     }
 

lib/Sema/DerivedConformanceRawRepresentable.cpp

@@ -214,9 +214,8 @@ struct RuntimeVersionCheck {
     auto otherSpec = new (C) OtherPlatformAvailabilitySpec(SourceLoc());
 
     // availableInfo = "#available(\(platformSpec), \(otherSpec))"
-    auto availableInfo = PoundAvailableInfo::create(C, SourceLoc(),
-                                              { platformSpec, otherSpec },
-                                                    SourceLoc());
+    auto availableInfo = PoundAvailableInfo::create(
+        C, SourceLoc(), { platformSpec, otherSpec }, SourceLoc());
 
     // This won't be filled in by TypeCheckAvailability because we have
     // invalid SourceLocs in this area of the AST.
@@ -242,8 +241,8 @@ struct RuntimeVersionCheck {
 /// be available, returns true. If it will sometimes be available, adds
 /// information about the runtime check needed to ensure it is available to
 /// \c versionCheck and returns true.
-static bool checkAvailability(EnumElementDecl* elt, ASTContext &C,
-                              Optional<RuntimeVersionCheck> &versionCheck) {
+static bool checkAvailability(const EnumElementDecl* elt, ASTContext &C,
+    Optional<RuntimeVersionCheck> &versionCheck) {
   auto *attr = elt->getAttrs().getPotentiallyUnavailable(C);
 
   // Is it always available?
@@ -261,7 +260,11 @@ static bool checkAvailability(EnumElementDecl* elt, ASTContext &C,
     return false;
 
   // It's conditionally available; create a version constraint and return true.
+  assert(attr->getPlatformAgnosticAvailability() ==
+             PlatformAgnosticAvailabilityKind::None &&
+         "can only express #available(somePlatform version) checks");
   versionCheck.emplace(attr->Platform, *attr->Introduced);
+
   return true;
 }
 

test/SILGen/enum_raw_representable_available.swift

@@ -1,53 +1,53 @@
 // RUN: %target-typecheck-verify-swift
-// RUN: %target-swift-emit-silgen -emit-sorted-sil %s | %FileCheck %s
-// RUN: %target-swift-emit-silgen -emit-sorted-sil -enable-resilience %s | %FileCheck %s
 
-// Really just requires a platform with meaningful runtime #available() tests.
-// REQUIRES: objc_interop
+// RUN: %target-swift-emit-silgen -emit-sorted-sil -o %t.fragile.sil %s
+// RUN: %FileCheck %s < %t.fragile.sil
+// RUN: %FileCheck -check-prefix NEGATIVE %s < %t.fragile.sil
+
+// RUN: %target-swift-emit-silgen -emit-sorted-sil -enable-resilience -o %t.resilient.sil %s
+// RUN: %FileCheck %s < %t.resilient.sil
+// RUN: %FileCheck -check-prefix NEGATIVE %s < %t.resilient.sil
+
+// This test just requires a platform with meaningful #available() checks, but
+// for simplicity, it's written for macOS only.
+// REQUIRES: OS=macosx
 
 public enum E: Int {
   // For some reason, we generate strange SIL for the first case that's
   // difficult to validate. This just gets that out of the way.
   case sacrificial = -500
 
   case normal = -1000
-  @available(macOS 10.8, iOS 7, watchOS 1, tvOS 7, *)
+
+  @available(macOS 10.8, *)
   case alwaysAvailable = -2000
-  @available(macOS 500.600.700, iOS 500.600.700, watchOS 500.600.700, tvOS 500.600.700, *)
+
+  @available(macOS 500.600.700, *)
   case potentiallyUnavailable = -3000
-  @available(macOS, unavailable) @available(iOS, unavailable)
-  @available(watchOS, unavailable)  @available(tvOS, unavailable)
+
+  @available(macOS, unavailable)
   case neverAvailable = -4000
-}
 
-// CHECK-LABEL: sil {{(\[serialized\] )?}}[ossa] @$s32enum_raw_representable_available1EO0B5ValueACSgSi_tcfC
+}
 
-// CHECK-NOT: integer_literal $Builtin.IntLiteral, -4000
+// CHECK-LABEL: sil {{(\[serialized\] )?}}[ossa] @$s4main1EO8rawValueACSgSi_tcfC
 
 // CHECK: integer_literal $Builtin.IntLiteral, -1000
 // CHECK: cond_br {{[^,]+}}, [[normal:bb[0-9]+]]
 
-// CHECK-NOT: integer_literal $Builtin.IntLiteral, -4000
-
 // CHECK: integer_literal $Builtin.IntLiteral, -2000
 // CHECK: cond_br {{[^,]+}}, [[alwaysAvailable:bb[0-9]+]]
 
-// CHECK-NOT: integer_literal $Builtin.IntLiteral, -4000
-
 // CHECK: integer_literal $Builtin.IntLiteral, -3000
 // CHECK: cond_br {{[^,]+}}, [[potentiallyUnavailable:bb[0-9]+]]
 
-// CHECK-NOT: integer_literal $Builtin.IntLiteral, -4000
-
 // CHECK: [[potentiallyUnavailable]]:
 // CHECK-NEXT: integer_literal $Builtin.Word, 500
 // CHECK-NEXT: integer_literal $Builtin.Word, 600
 // CHECK-NEXT: integer_literal $Builtin.Word, 700
 // CHECK: function_ref @$ss26_stdlib_isOSVersionAtLeastyBi1_Bw_BwBwtF
 // CHECK: cond_br {{[^,]+}}, [[potentiallyUnavailable_newEnough:bb[0-9]+]],
 
-// CHECK-NOT: integer_literal $Builtin.IntLiteral, -4000
-
 // CHECK: [[potentiallyUnavailable_newEnough]]:
 // CHECK: {{enum \$E|inject_enum_addr %[0-9]+ : \$\*E}}, #E.potentiallyUnavailable!enumelt
 
@@ -59,9 +59,13 @@ public enum E: Int {
 // CHECK-NOT: function_ref @$ss26_stdlib_isOSVersionAtLeastyBi1_Bw_BwBwtF
 // CHECK: {{enum \$E|inject_enum_addr %[0-9]+ : \$\*E}}, #E.normal!enumelt
 
-// CHECK: end sil function '$s32enum_raw_representable_available1EO0B5ValueACSgSi_tcfC'
+// CHECK: end sil function '$s4main1EO8rawValueACSgSi_tcfC'
 
-// CHECK-LABEL: sil {{(\[serialized\] )?}}[ossa] @$s32enum_raw_representable_available1EO0B5ValueSivg
+// CHECK-LABEL: sil {{(\[serialized\] )?}}[ossa] @$s4main1EO8rawValueSivg
 // CHECK: {{switch_enum %0 : \$E|switch_enum_addr %2 : \$\*E}}
 // CHECK-NOT: function_ref @$ss26_stdlib_isOSVersionAtLeastyBi1_Bw_BwBwtF
-// CHECK: end sil function '$s32enum_raw_representable_available1EO0B5ValueSivg'
+// CHECK: end sil function '$s4main1EO8rawValueSivg'
+
+// NEGATIVE-LABEL: sil {{(\[serialized\] )?}}[ossa] @$s4main1EO8rawValueACSgSi_tcfC
+// NEGATIVE-NOT: integer_literal $Builtin.IntLiteral, -4000
+// NEGATIVE: end sil function '$s4main1EO8rawValueACSgSi_tcfC'