Merge pull request #15319 from slavapestov/remove-disable-resilience

slavapestov · web-flow · commit fbdd36cda8fc · 2018-03-16T20:37:29.000-07:00
Remove build-script flag to disable resilience
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -295,10 +295,6 @@ option(SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
   "Should the runtime be built with support for non-thread-safe leak detecting entrypoints"
   FALSE)
 
-option(SWIFT_STDLIB_ENABLE_RESILIENCE
-    "Build the standard libraries and overlays with resilience enabled; see docs/LibraryEvolution.rst"
-    FALSE)
-
 option(SWIFT_STDLIB_USE_NONATOMIC_RC
     "Build the standard libraries and overlays with nonatomic reference count operations enabled"
     FALSE)
diff --git a/cmake/modules/SwiftSource.cmake b/cmake/modules/SwiftSource.cmake
@@ -232,7 +232,8 @@ function(_compile_swift_files
     list(APPEND swift_flags "-Xfrontend" "-sil-verify-all")
   endif()
 
-  if(SWIFT_STDLIB_ENABLE_RESILIENCE AND SWIFTFILE_IS_STDLIB)
+  # The standard library and overlays are always built with resilience.
+  if(SWIFTFILE_IS_STDLIB)
     list(APPEND swift_flags "-Xfrontend" "-enable-resilience")
   endif()
 
diff --git a/test/IRGen/big_types_corner_cases.sil b/test/IRGen/big_types_corner_cases.sil
@@ -1,9 +1,6 @@
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -I %S/Inputs/abi %s -emit-ir -enable-large-loadable-types | %FileCheck %s
 
-// UNSUPPORTED: resilient_stdlib
-
 // REQUIRES: CPU=x86_64
-
 // REQUIRES: OS=macosx
 
 sil_stage canonical
diff --git a/test/IRGen/big_types_corner_cases.swift b/test/IRGen/big_types_corner_cases.swift
@@ -2,7 +2,6 @@
 
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -enable-large-loadable-types %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 // REQUIRES: optimized_stdlib
-// UNSUPPORTED: resilient_stdlib
 
 public struct BigStruct {
   var i0 : Int32 = 0
diff --git a/test/IRGen/big_types_corner_cases_as_library.swift b/test/IRGen/big_types_corner_cases_as_library.swift
@@ -1,5 +1,4 @@
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -enable-large-loadable-types %s -emit-ir  -parse-as-library | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
-// UNSUPPORTED: resilient_stdlib
 
 public struct BigStruct {
   var i0 : Int32 = 0
diff --git a/test/IRGen/big_types_tests.sil b/test/IRGen/big_types_tests.sil
@@ -1,9 +1,6 @@
 // RUN: %target-swift-frontend -I %S/Inputs/abi %s -emit-ir -enable-large-loadable-types | %FileCheck %s
 
-// UNSUPPORTED: resilient_stdlib
-
 // REQUIRES: CPU=x86_64
-
 // REQUIRES: OS=macosx
 
 sil_stage canonical
diff --git a/test/IRGen/objc_shared_imported_decl.sil b/test/IRGen/objc_shared_imported_decl.sil
@@ -1,8 +1,7 @@
 // RUN: %target-swift-frontend -primary-file %s -import-objc-header %S/Inputs/usr/include/NSOption.h -emit-ir | %FileCheck %s
 
-// UNSUPPORTED: resilient_stdlib
-
 // REQUIRES: objc_interop
+// XFAIL: *
 
 import Swift
 
diff --git a/test/IRGen/open_boxed_existential.sil b/test/IRGen/open_boxed_existential.sil
@@ -1,7 +1,5 @@
 // RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %s -emit-ir | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime
 
-// XFAIL: resilient_stdlib
-
 import Swift
 
 // CHECK-LABEL: define{{( protected)?}} swiftcc {{i[0-9]+}} @open_boxed_existential(%swift.error*)
@@ -15,13 +13,9 @@ entry(%b : $Error):
   // CHECK: [[OUT_WITNESS:%.*]] = getelementptr inbounds {{.*}} [[OUT]], i32 0, i32 2
   // CHECK: [[WITNESS:%.*]] = load {{.*}} [[OUT_WITNESS]]
   %o = open_existential_box %b : $Error to $*@opened("01234567-89AB-CDEF-0123-000000000000") Error
-  // CHECK: [[CODE_ADDR:%.*]] = getelementptr {{.*}} [[WITNESS]], i32 2
-  // CHECK: [[CODE:%.*]] = load {{.*}} [[CODE_ADDR]]
   %m = witness_method $@opened("01234567-89AB-CDEF-0123-000000000000") Error, #Error._code!getter.1, %o : $*@opened("01234567-89AB-CDEF-0123-000000000000") Error : $@convention(witness_method: Error) <Self: Error> (@in_guaranteed Self) -> Int
-  // CHECK: [[CODE_FN:%.*]] = bitcast i8* [[CODE]] to [[INT:i[0-9]+]] (%swift.opaque*, %swift.type*, i8**)*
-  // CHECK: [[RESULT:%.*]] = call swiftcc [[INT]] [[CODE_FN]](%swift.opaque* noalias nocapture swiftself [[ADDR]], %swift.type* [[TYPE]], i8** [[WITNESS]])
+  // CHECK: [[RESULT:%.*]] =  call swiftcc [[INT:i[0-9]+]] @"$Ss5ErrorP5_codeSivgTj"(%swift.opaque* noalias nocapture swiftself [[ADDR]], %swift.type* [[TYPE]], i8** [[WITNESS]])
   %c = apply %m<@opened("01234567-89AB-CDEF-0123-000000000000") Error>(%o) : $@convention(witness_method: Error) <Self: Error> (@in_guaranteed Self) -> Int
   // CHECK: ret [[INT]] [[RESULT]]
   return %c : $Int
 }
-
diff --git a/test/IRGen/open_boxed_existential_resilience.sil b/test/IRGen/open_boxed_existential_resilience.sil
diff --git a/test/SILGen/opaque_values_silgen.swift b/test/SILGen/opaque_values_silgen.swift
@@ -1,9 +1,7 @@
 // REQUIRES: plus_one_runtime
-
+// XFAIL: *
 // RUN: %target-swift-frontend -enable-sil-opaque-values -emit-sorted-sil -Xllvm -sil-full-demangle -emit-silgen %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
 
-// UNSUPPORTED: resilient_stdlib
-
 struct TrivialStruct {
   var x: Int
 }
diff --git a/test/SILGen/opaque_values_silgen_lib.swift b/test/SILGen/opaque_values_silgen_lib.swift
@@ -1,7 +1,6 @@
 // REQUIRES: plus_one_runtime
 
 // RUN: %target-swift-frontend -enable-sil-ownership -enable-sil-opaque-values -emit-sorted-sil -Xllvm -sil-full-demangle -parse-stdlib -parse-as-library -emit-silgen -module-name Swift %s | %FileCheck %s
-// UNSUPPORTED: resilient_stdlib
 
 precedencegroup AssignmentPrecedence { assignment: true }
 
diff --git a/test/SILOptimizer/sil_combine_objc.sil b/test/SILOptimizer/sil_combine_objc.sil
@@ -1,9 +1,6 @@
 // RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -sil-combine -verify-skip-unreachable-must-be-last | %FileCheck %s
 // REQUIRES: objc_interop
 
-// FIXME: https://bugs.swift.org/browse/SR-2808
-// XFAIL: resilient_stdlib
-
 // See https://bugs.swift.org/browse/SR-5065, rdar://32511494
 // XFAIL: *
 
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
@@ -67,9 +67,6 @@ if "@SWIFT_AST_VERIFIER@" == "TRUE":
 if "@SWIFT_OPTIMIZED@" == "TRUE":
     config.available_features.add("optimized_stdlib")
 
-if "@SWIFT_STDLIB_ENABLE_RESILIENCE@" == "TRUE":
-    config.available_features.add("resilient_stdlib")
-
 if "@SWIFT_STDLIB_USE_NONATOMIC_RC@" == "TRUE":
     config.available_features.add("nonatomic_rc")
 
diff --git a/test/stdlib/TestData.swift b/test/stdlib/TestData.swift
@@ -15,7 +15,6 @@
 // RUN: %target-run %t/TestData
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
-// UNSUPPORTED: resilient_stdlib
 
 import Foundation
 import Dispatch
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
@@ -1172,14 +1172,6 @@ skip-test-tvos-host
 skip-test-watchos-host
 
 
-# Like the regular PR testing preset, but with resilience enabled
-[preset: buildbot_all_platforms,tools=RA,stdlib=RA,resilience]
-mixin-preset=buildbot_all_platforms,tools=RA,stdlib=RA
-
-swift-stdlib-enable-resilience
-
-
-
 #===------------------------------------------------------------------------===#
 # Test watchOS on OS X builder
 #===------------------------------------------------------------------------===#
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -71,7 +71,6 @@ KNOWN_SETTINGS=(
     llvm-num-parallel-lto-link-jobs ""           "The number of parallel link jobs to use when compiling llvm"
     swift-stdlib-build-type     "Debug"          "the CMake build variant for Swift"
     swift-stdlib-enable-assertions "1"           "enable assertions in Swift"
-    swift-stdlib-enable-resilience "1"           "build the Swift stdlib and overlays with resilience enabled"
     swift-stdlib-use-nonatomic-rc "0"            "build the Swift stdlib and overlays with nonatomic reference count operations enabled"
     lldb-build-type             "Debug"          "the CMake build variant for LLDB"
     lldb-build-with-xcode       "1"              "Use xcodebuild to build LLDB, instead of CMake"
@@ -2098,7 +2097,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DSWIFT_ANALYZE_CODE_COVERAGE:STRING=$(toupper "${SWIFT_ANALYZE_CODE_COVERAGE}")
                     -DSWIFT_STDLIB_BUILD_TYPE:STRING="${SWIFT_STDLIB_BUILD_TYPE}"
                     -DSWIFT_STDLIB_ASSERTIONS:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_ASSERTIONS}")
-                    -DSWIFT_STDLIB_ENABLE_RESILIENCE:BOOL=$(true_false "${SWIFT_STDLIB_ENABLE_RESILIENCE}")
                     -DSWIFT_STDLIB_USE_NONATOMIC_RC:BOOL=$(true_false "${SWIFT_STDLIB_USE_NONATOMIC_RC}")
                     -DSWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS:BOOL=$(true_false "${SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS}")
                     -DSWIFT_NATIVE_LLVM_TOOLS_PATH:STRING="${native_llvm_tools_path}"
diff --git a/validation-test/lit.site.cfg.in b/validation-test/lit.site.cfg.in
@@ -68,9 +68,6 @@ if "@SWIFT_OPTIMIZED@" == "TRUE":
 if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
     config.available_features.add('sourcekit')
 
-if "@SWIFT_STDLIB_ENABLE_RESILIENCE@" == "TRUE":
-    config.available_features.add("resilient_stdlib")
-
 if "@SWIFT_STDLIB_USE_NONATOMIC_RC@" == "TRUE":
     config.available_features.add("nonatomic_rc")
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -enable-large-loadable-types %s -emit-ir -parse-as-library \| %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize`
`2`		`-// UNSUPPORTED: resilient_stdlib`
`3`	`2`
`4`	`3`	`public struct BigStruct {`
`5`	`4`	`var i0 : Int32 = 0`