[test] Adjust for Optional relying on $NonescapableTypes now

Author: lorentey

test/Concurrency/sending_conditional_suppression.swift

@@ -206,13 +206,17 @@ public struct TestInStruct {
 // Make sure that we emit compiler(>= 5.3) when emitting the suppressing check
 // to make sure we do not fail if we fail to parse sending in the if block.
 
-// CHECK: #if compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 24
+// 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:  fatalError()
+// CHECK-NEXT: }
+// CHECK-NEXT: #elseif 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: }
 // CHECK-NEXT: #else
 // 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 -> T {
-// CHECK-NEXT:   fatalError()
+// CHECK-NEXT:  fatalError()
 // CHECK-NEXT: }
 // CHECK-NEXT: #endif
 @inlinable public func withCheckedContinuation<T>(
@@ -223,14 +227,14 @@ public struct TestInStruct {
   fatalError()
 }
 
-// CHECK-LABEL: #if compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 25
+// CHECK-LABEL: #if compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 26
 // CHECK-NEXT: public var publicGlobal: (sending test.NonSendableKlass) -> ()
 // CHECK-NEXT: #else
 // CHECK-NEXT: public var publicGlobal: (__owned test.NonSendableKlass) -> ()
 // CHECK-NEXT: #endif
 public var publicGlobal: (sending NonSendableKlass) -> () = { x in fatalError() }
 
-// CHECK-LABEL: #if compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 26
+// CHECK-LABEL: #if compiler(>=5.3) && $SendingArgsAndResults // Suppression Count: 27
 // CHECK-NEXT: @usableFromInline
 // CHECK-NEXT: internal var usableFromInlineGlobal: (sending test.NonSendableKlass) -> ()
 // CHECK-NEXT: #else

test/ModuleInterface/noncopyable_generics.swift

@@ -138,15 +138,31 @@ import NoncopyableGenerics_Misc
 // CHECK-MISC-NEXT: public func referToLoudProperGuarding(_ t: {{.*}}.LoudlyNC<Swift.String>)
 // CHECK-MISC-NEXT: public struct NoCopyPls : ~Swift.Copyable {
 // 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 {
 // CHECK-MISC-NEXT: }

test/stdlib/Optional.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-enable-experimental-feature NonescapableTypes)
+// RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: reflection