[test] Adjust tests now that Optional supports nonescapable use

`Optional` is now depending on `$NonescapableTypes`, and thus the compiler no longer generates `#else` branches to allow suppressing that feature.

Author: lorentey

test/Concurrency/sending_conditional_suppression.swift

@@ -207,10 +207,7 @@ public struct TestInStruct {
 // to make sure we do not fail if we fail to parse sending in the if block.
 
 // CHECK: #if compiler(>=5.3) && $NonescapableTypes // Suppression Count: 24
-// CHECK-NEXT: @inlinable public func withCheckedContinuation<T>(isolation: isolated (any _Concurrency.Actor)? = #isolation, function: Swift.String = #function, _ body: (_Concurrency.CheckedContinuation<T, Swift.Never>) -> Swift.Void) async -> sending T {
-// CHECK-NEXT:  fatalError()
-// CHECK-NEXT: }
-// CHECK-NEXT: #elseif compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 25
+// CHECK-NEXT: #if compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 25
 // CHECK-NEXT: @inlinable public func withCheckedContinuation<T>(isolation: isolated (any _Concurrency.Actor)? = #isolation, function: Swift.String = #function, _ body: (_Concurrency.CheckedContinuation<T, Swift.Never>) -> Swift.Void) async -> sending T {
 // CHECK-NEXT:  fatalError()
 // CHECK-NEXT: }
@@ -219,6 +216,7 @@ public struct TestInStruct {
 // CHECK-NEXT:  fatalError()
 // CHECK-NEXT: }
 // CHECK-NEXT: #endif
+// CHECK-NEXT: #endif
 @inlinable public func withCheckedContinuation<T>(
   isolation: isolated (any _Concurrency.Actor)? = #isolation,
   function: String = #function,

test/Macros/SwiftifyImport/MacroErrors/NullableSpan.swift

@@ -2,8 +2,6 @@
 
 // RUN: %target-typecheck-verify-swift -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -verify
 
-// XFAIL: *
-// expanded form errors with "type 'Span' does not conform to protocol 'Escapable'" because Optional doesn't support ~Escapable yet 
 @_SwiftifyImport(.countedBy(pointer: .param(1), count: "len"), .nonescaping(pointer: .param(1)))
 func nullableSpan(_ ptr: UnsafePointer<CInt>?, _ len: CInt) {
 }

test/Macros/SwiftifyImport/SizedBy/Opaque.swift

@@ -21,8 +21,6 @@ func impNullableUnsafeRawBufferPointer(_ ptr: OpaquePointer!, _ size: CInt) {
 func nonnullSpan(_ ptr: OpaquePointer, _ size: CInt) {
 }
 
-// expected-note@+2{{in expansion of macro '_SwiftifyImport' on global function 'nullableSpan' here}}
-// Cannot refer to source location for the error: "type 'RawSpan' does not conform to protocol 'Escapable'" (which is currently necessary for Optional)
 @_SwiftifyImport(.sizedBy(pointer: .param(1), size: "size"), .nonescaping(pointer: .param(1)))
 func nullableSpan(_ ptr: OpaquePointer?, _ size: CInt) {
 }

test/ModuleInterface/noncopyable_generics.swift

@@ -140,28 +140,16 @@ import NoncopyableGenerics_Misc
 // CHECK-MISC-NEXT: }
 // CHECK-MISC-NEXT: #if compiler(>=5.3) && $NonescapableTypes
 // CHECK-MISC-NEXT: public func substCopyable(_ t: Swift.String?)
-// CHECK-MISC-NEXT: #else
-// CHECK-MISC-NEXT: public func substCopyable(_ t: Swift.String?)
 // CHECK-MISC-NEXT: #endif
 // CHECK-MISC-NEXT: #if compiler(>=5.3) && $NonescapableTypes
 // CHECK-MISC-NEXT: public func substGenericCopyable<T>(_ t: T?)
-// CHECK-MISC-NEXT: #else
-// CHECK-MISC-NEXT: public func substGenericCopyable<T>(_ t: T?)
 // CHECK-MISC-NEXT: #endif
 
-// NOTE: we really shouldn't be emitting the else branch for the two funcs
-// below, since the suppressed version isn't valid. We don't have a good way of
-// fixing that right now, either.
-
 // CHECK-MISC-NEXT: #if compiler(>=5.3) && $NonescapableTypes
 // CHECK-MISC-NEXT: public func substNC(_ t: borrowing {{.*}}.NoCopyPls?)
-// CHECK-MISC-NEXT: #else
-// CHECK-MISC-NEXT: public func substNC(_ t: borrowing {{.*}}.NoCopyPls?)
 // CHECK-MISC-NEXT: #endif
 // CHECK-MISC-NEXT: #if compiler(>=5.3) && $NonescapableTypes
 // CHECK-MISC-NEXT: public func substGenericNC<T>(_ t: borrowing T?) where T : ~Copyable
-// CHECK-MISC-NEXT: #else
-// CHECK-MISC-NEXT: public func substGenericNC<T>(_ t: borrowing T?) where T : ~Copyable
 // CHECK-MISC-NEXT: #endif
 
 // CHECK-MISC:      public protocol Publik : ~Copyable {