Merge pull request swiftlang#34009 from eeckstein/fix-cow-checks

Author: swift-ci

stdlib/public/core/ContiguousArrayBuffer.swift

@@ -14,16 +14,8 @@ import SwiftShims
 
 #if INTERNAL_CHECKS_ENABLED
 @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
-@_silgen_name("swift_COWSanityChecksEnabled")
-public func _COWSanityChecksEnabled() -> Bool
-
-@_alwaysEmitIntoClient
-internal func doCOWSanityChecks() -> Bool {
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
-    return _COWSanityChecksEnabled()
-  }
-  return false
-}
+@_silgen_name("swift_COWChecksEnabled")
+public func _COWChecksEnabled() -> Bool
 #endif
 
 /// Class used whose sole instance is used as storage for empty
@@ -468,34 +460,40 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {
   @_alwaysEmitIntoClient
   internal var isImmutable: Bool {
     get {
-      if doCOWSanityChecks() {
-        return capacity == 0 || _swift_isImmutableCOWBuffer(_storage)
+      if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+        if (_COWChecksEnabled()) {
+          return capacity == 0 || _swift_isImmutableCOWBuffer(_storage)
+        }
       }
       return true
     }
     nonmutating set {
-      if doCOWSanityChecks() {
-        if newValue {
-          if capacity > 0 {
-            let wasImmutable = _swift_setImmutableCOWBuffer(_storage, true)
-            _internalInvariant(!wasImmutable,
-              "re-setting immutable array buffer to immutable")
+      if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+        if (_COWChecksEnabled()) {
+          if newValue {
+            if capacity > 0 {
+              let wasImmutable = _swift_setImmutableCOWBuffer(_storage, true)
+              _internalInvariant(!wasImmutable,
+                "re-setting immutable array buffer to immutable")
+            }
+          } else {
+            _internalInvariant(capacity > 0,
+              "setting empty array buffer to mutable")
+             let wasImmutable = _swift_setImmutableCOWBuffer(_storage, false)
+            _internalInvariant(wasImmutable,
+              "re-setting mutable array buffer to mutable")
           }
-        } else {
-          _internalInvariant(capacity > 0,
-            "setting empty array buffer to mutable")
-           let wasImmutable = _swift_setImmutableCOWBuffer(_storage, false)
-          _internalInvariant(wasImmutable,
-            "re-setting mutable array buffer to mutable")
         }
       }
     }
   }
 
   @_alwaysEmitIntoClient
   internal var isMutable: Bool {
-    if doCOWSanityChecks() {
-      return !_swift_isImmutableCOWBuffer(_storage)
+    if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+      if (_COWChecksEnabled()) {
+        return !_swift_isImmutableCOWBuffer(_storage)
+      }
     }
     return true
   }

stdlib/public/runtime/EnvironmentVariables.cpp

@@ -190,7 +190,7 @@ void swift::runtime::environment::initialize(void *context) {
 #endif
 
 SWIFT_RUNTIME_EXPORT
-bool swift_COWSanityChecksEnabled() {
-  return runtime::environment::SWIFT_DEBUG_ENABLE_COW_SANITY_CHECKS();
+bool swift_COWChecksEnabled() {
+  return runtime::environment::SWIFT_DEBUG_ENABLE_COW_CHECKS();
 }
 

stdlib/public/runtime/EnvironmentVariables.def

@@ -44,7 +44,7 @@ VARIABLE(SWIFT_ENABLE_MANGLED_NAME_VERIFICATION, bool, false,
 VARIABLE(SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE, bool, false,
          "Scribble on runtime allocations such as metadata allocations.")
 
-VARIABLE(SWIFT_DEBUG_ENABLE_COW_SANITY_CHECKS, bool, false,
-         "Enable sanity checks for copy-on-write operations.")
+VARIABLE(SWIFT_DEBUG_ENABLE_COW_CHECKS, bool, false,
+         "Enable internal checks for copy-on-write operations.")
 
 #undef VARIABLE

test/lit.cfg

@@ -1993,7 +1993,7 @@ config.environment[TARGET_ENV_PREFIX + 'SWIFT_DETERMINISTIC_HASHING'] = '1'
 config.environment[TARGET_ENV_PREFIX + 'SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE'] = 'YES'
 
 # Enable COW sanity checks in the swift runtime by default.
-config.environment['SWIFT_DEBUG_ENABLE_COW_SANITY_CHECKS'] = 'true'
+config.environment['SWIFT_DEBUG_ENABLE_COW_CHECKS'] = 'true'
 
 # Run lsb_release on the target to be tested and return the results.
 def linux_get_lsb_release():