Merge pull request #18388 from rjmccall/disable-overlay-resilience-4.2

Disable overlay resilience in the 4.2 release

Author: rjmccall

cmake/modules/SwiftSource.cmake

@@ -232,8 +232,8 @@ function(_compile_swift_files
     list(APPEND swift_flags "-Xfrontend" "-sil-verify-all")
   endif()
 
-  # The standard library and overlays are always built with resilience.
-  if(SWIFTFILE_IS_STDLIB)
+  # The standard library are always built with resilience, but not the overlays yet.
+  if(SWIFTFILE_IS_STDLIB_CORE)
     list(APPEND swift_flags "-Xfrontend" "-enable-resilience")
   endif()
 

test/IRGen/availability.swift

@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -emit-ir | %FileCheck %s
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -primary-file %s -O -emit-ir | %FileCheck %s
 
-// REQUIRES: objc_interop
+// REQUIRES: objc_interop, overlay_resilience
 
 import Foundation