Make _sanityCheck internal

Author: airspeedswift

stdlib/public/SDK/Foundation/NSArray.swift

@@ -31,7 +31,7 @@ extension Array : _ObjectiveCBridgeable {
   /// The provided `NSArray` will be copied to ensure that the copy can
   /// not be mutated by other code.
   internal init(_cocoaArray: NSArray) {
-    _sanityCheck(_isBridgedVerbatimToObjectiveC(Element.self),
+    precondition(_isBridgedVerbatimToObjectiveC(Element.self),
       "Array can be backed by NSArray only when the element type can be bridged verbatim to Objective-C")
     // FIXME: We would like to call CFArrayCreateCopy() to avoid doing an
     // objc_msgSend() for instances of CoreFoundation types.  We can't do that

stdlib/public/SDK/Foundation/NSDictionary.swift

@@ -35,7 +35,7 @@ extension Dictionary {
   /// The provided `NSDictionary` will be copied to ensure that the copy can
   /// not be mutated by other code.
   public init(_cocoaDictionary: _NSDictionary) {
-    _sanityCheck(
+    precondition(
       _isBridgedVerbatimToObjectiveC(Key.self) &&
       _isBridgedVerbatimToObjectiveC(Value.self),
       "Dictionary can be backed by NSDictionary storage only when both key and value are bridged verbatim to Objective-C")
@@ -228,8 +228,8 @@ extension NSDictionary {
     let alignment = MemoryLayout<AnyObject>.alignment
     let singleSize = stride * numElems
     let totalSize = singleSize * 2
-    _sanityCheck(stride == MemoryLayout<NSCopying>.stride)
-    _sanityCheck(alignment == MemoryLayout<NSCopying>.alignment)
+    precondition(stride == MemoryLayout<NSCopying>.stride)
+    precondition(alignment == MemoryLayout<NSCopying>.alignment)
 
     // Allocate a buffer containing both the keys and values.
     let buffer = UnsafeMutableRawPointer.allocate(

stdlib/public/SDK/Foundation/NSSet.swift

@@ -18,7 +18,7 @@ extension Set {
   /// The provided `NSSet` will be copied to ensure that the copy can
   /// not be mutated by other code.
   public init(_cocoaSet: _NSSet) {
-    _sanityCheck(_isBridgedVerbatimToObjectiveC(Element.self),
+    precondition(_isBridgedVerbatimToObjectiveC(Element.self),
       "Set can be backed by NSSet _variantStorage only when the member type can be bridged verbatim to Objective-C")
     // FIXME: We would like to call CFSetCreateCopy() to avoid doing an
     // objc_msgSend() for instances of CoreFoundation types.  We can't do that

stdlib/public/SDK/Foundation/NSStringAPI.swift

@@ -1637,7 +1637,7 @@ extension StringProtocol where Index == String.Index {
   public func contains<T : StringProtocol>(_ other: T) -> Bool {
     let r = self.range(of: other) != nil
     if #available(macOS 10.10, iOS 8.0, *) {
-      _sanityCheck(r == _ns.contains(other._ephemeralString))
+      precondition(r == _ns.contains(other._ephemeralString))
     }
     return r
   }
@@ -1660,7 +1660,7 @@ extension StringProtocol where Index == String.Index {
       of: other, options: .caseInsensitive, locale: Locale.current
     ) != nil
     if #available(macOS 10.10, iOS 8.0, *) {
-      _sanityCheck(r ==
+      precondition(r ==
         _ns.localizedCaseInsensitiveContains(other._ephemeralString))
     }
     return r

stdlib/public/SDK/SpriteKit/SpriteKit.swift

@@ -25,7 +25,7 @@ public typealias SKColor = UIColor
 // since that method only exists in a private header in SpriteKit, the lookup
 // mechanism by default fails to accept it as a valid AnyObject call
 @objc class _SpriteKitMethodProvider : NSObject {
-  override init() { _sanityCheckFailure("don't touch me") }
+  override init() { preconditionFailure("don't touch me") }
   @objc func _copyImageData() -> NSData! { return nil }
 }
 

stdlib/public/core/Assert.swift

@@ -284,8 +284,8 @@ public func _debugPreconditionFailure(
 /// standard library. They are only enable when the standard library is built
 /// with the build configuration INTERNAL_CHECKS_ENABLED enabled. Otherwise, the
 /// call to this function is a noop.
-@_transparent
-public func _sanityCheck(
+@usableFromInline @_transparent
+internal func _sanityCheck(
   _ condition: @autoclosure () -> Bool, _ message: StaticString = StaticString(),
   file: StaticString = #file, line: UInt = #line
 ) {
@@ -297,8 +297,8 @@ public func _sanityCheck(
 #endif
 }
 
-@_transparent
-public func _sanityCheckFailure(
+@usableFromInline @_transparent
+internal func _sanityCheckFailure(
   _ message: StaticString = StaticString(),
   file: StaticString = #file, line: UInt = #line
 ) -> Never {

test/Prototypes/Algorithms.swift

@@ -73,8 +73,8 @@ extension MutableCollection {
   internal mutating func _swapNonemptySubrangePrefixes(
     _ lhs: Range<Index>, _ rhs: Range<Index>
   ) -> (Index, Index) {
-    _sanityCheck(!lhs.isEmpty)
-    _sanityCheck(!rhs.isEmpty)
+    assert(!lhs.isEmpty)
+    assert(!rhs.isEmpty)
 
     var p = lhs.lowerBound
     var q = rhs.lowerBound
@@ -352,7 +352,7 @@ public struct Concatenation<C1 : Collection, C2: Collection>: Collection
   public func index(after i: Index) -> Index {
     switch i._position {
     case let .first(i):
-      _sanityCheck(i != _base1.endIndex)
+      assert(i != _base1.endIndex)
       let next = _base1.index(after: i)
       return next == _base1.endIndex
         ? Index(second: _base2.startIndex)

test/Prototypes/BigInt.swift

@@ -120,7 +120,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
 
     // FIXME: This is broken on 32-bit arch w/ Word = UInt64
     let wordRatio = UInt.bitWidth / Word.bitWidth
-    _sanityCheck(wordRatio != 0)
+    assert(wordRatio != 0)
     for var sourceWord in source.words {
       for _ in 0..<wordRatio {
         _data.append(Word(truncatingIfNeeded: sourceWord))
@@ -260,7 +260,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
       if carry == 0 { break }
       (carry, _data[i]) = _data[i].subtractingWithBorrow(carry)
     }
-    _sanityCheck(carry == 0)
+    assert(carry == 0)
 
     _standardize()
   }
@@ -425,7 +425,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
       if carry == 0 { break }
       (carry, _data[i]) = _data[i].subtractingWithBorrow(carry)
     }
-    _sanityCheck(carry == 0)
+    assert(carry == 0)
 
     _standardize()
   }
@@ -476,7 +476,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
     let (a, b) = lhs._data.count > rhs._data.count
       ? (lhs._data, rhs._data)
       : (rhs._data, lhs._data)
-    _sanityCheck(a.count >= b.count)
+    assert(a.count >= b.count)
 
     var carry: Word = 0
     for ai in 0..<a.count {
@@ -513,12 +513,12 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
         //      0b11111111 + (0b11111101_____00000010) + 0b11111111
         //                   (0b11111110_____00000001) + 0b11111111
         //                   (0b11111111_____00000000)
-        _sanityCheck(!product.high.addingReportingOverflow(carry).overflow)
+        assert(!product.high.addingReportingOverflow(carry).overflow)
         carry = product.high &+ carry
       }
 
       // Leftover `carry` is inserted in new highest word.
-      _sanityCheck(newData[ai + b.count] == 0)
+      assert(newData[ai + b.count] == 0)
       newData[ai + b.count] = carry
     }
 
@@ -659,7 +659,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
   }
 
   public var words: [UInt] {
-    _sanityCheck(UInt.bitWidth % Word.bitWidth == 0)
+    assert(UInt.bitWidth % Word.bitWidth == 0)
     let twosComplementData = _dataAsTwosComplement()
     var words: [UInt] = []
     words.reserveCapacity((twosComplementData.count * Word.bitWidth 
@@ -713,7 +713,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
     }
 
     let i = _data.firstIndex(where: { $0 != 0 })!
-    _sanityCheck(_data[i] != 0)
+    assert(_data[i] != 0)
     return i * Word.bitWidth + _data[i].trailingZeroBitCount
   }
 

test/Prototypes/DoubleWidth.swift.gyb

@@ -235,7 +235,7 @@ extension DoubleWidth {
       }
       self._high = value._storage.high.words
       self._low = value._storage.low.words
-      _sanityCheck(!_low.isEmpty)
+      assert(!_low.isEmpty)
     }
   }
 }
@@ -299,7 +299,7 @@ extension DoubleWidth.Words: Collection {
   public subscript(_ i: Index) -> UInt {
     if Base.bitWidth < UInt.bitWidth {
       _precondition(i == Index(.low(_low.startIndex)), "Invalid index")
-      _sanityCheck(2 * Base.bitWidth <= UInt.bitWidth)
+      assert(2 * Base.bitWidth <= UInt.bitWidth)
       return _low.first! | (_high.first! &<< Base.bitWidth._lowWord) 
     }
     switch i._value {
@@ -633,9 +633,9 @@ extension DoubleWidth : UnsignedInteger where Base : UnsignedInteger {
   ) -> (quotient: Low, remainder: Magnitude) {
     // The following invariants are guaranteed to hold by dividingFullWidth or
     // quotientAndRemainder before this method is invoked:
-    _sanityCheck(lhs.high != (0 as Low))
-    _sanityCheck(rhs.leadingZeroBitCount == 0)
-    _sanityCheck(Magnitude(lhs.high, lhs.mid) < rhs)
+    assert(lhs.high != (0 as Low))
+    assert(rhs.leadingZeroBitCount == 0)
+    assert(Magnitude(lhs.high, lhs.mid) < rhs)
 
     // Estimate the quotient.
     var quotient = lhs.high == rhs.high

test/SILOptimizer/access_marker_verify.swift

@@ -960,7 +960,7 @@ extension UsesSelf {
 // --- autoclosure
 struct StructWithLayout {
   internal init() {
-    _sanityCheck(MemoryLayout.size(ofValue: self) >= 0)
+    assert(MemoryLayout.size(ofValue: self) >= 0)
   }
 }
 // CHECK-LABEL: sil hidden @$S20access_marker_verify16StructWithLayoutVACycfC : $@convention(method) (@thin StructWithLayout.Type) -> StructWithLayout {
@@ -975,7 +975,6 @@ struct StructWithLayout {
 // call UInt.init(_builtinIntegerLiteral:)
 // CHECK: apply
 // call default argument
-// CHECK: apply %{{.*}}() : $@convention(thin) () -> StaticString
 // call _sanityCheck(_:_:file:line:)
 // CHECK: apply %{{.*}}([[CLOSURE]], {{.*}})
 // CHECK: load [trivial] [[PROJ]] : $*StructWithLayout

validation-test/compiler_crashers_2_fixed/0109-sr4737.swift

@@ -528,7 +528,7 @@ extension _UTFEncoding {
     }
     // Buffering mode.
     // Fill buffer back to 4 bytes (or as many as are left in the iterator).
-    _sanityCheck(buffer._bitCount < BufferStorage.bitWidth)
+    assert(buffer._bitCount < BufferStorage.bitWidth)
     repeat {
       if let codeUnit = input.next() {
         buffer.append(codeUnit)
@@ -588,7 +588,7 @@ extension Unicode.UTF8 : UnicodeEncoding {
       value    |= (bits & 0b0________________________________0000_1111) &<< 12
       return UnicodeScalar(_unchecked: value)
     default:
-      _sanityCheck(source.count == 4)
+      assert(source.count == 4)
       var value = (bits & 0b0_11_1111__0000_0000__0000_0000__0000_0000) &>> 24
       value    |= (bits & 0b0____________11_1111__0000_0000__0000_0000) &>> 10
       value    |= (bits & 0b0_______________________11_1111__0000_0000) &<< 4
@@ -634,7 +634,7 @@ extension Unicode.UTF8.ReverseDecoder : _UTF8Decoder {
 
   public // @testable
   func _parseMultipleCodeUnits() -> Unicode.ParseResult<EncodedScalar> {
-    _sanityCheck(buffer._storage & 0x80 != 0) // this case handled elsewhere
+    assert(buffer._storage & 0x80 != 0) // this case handled elsewhere
 
     if buffer._storage                & 0b0__1110_0000__1100_0000
                                      == 0b0__1100_0000__1000_0000 {
@@ -737,7 +737,7 @@ extension Unicode.UTF8.ForwardDecoder : _UTF8Decoder {
 
   public // @testable
   func _parseMultipleCodeUnits() -> Unicode.ParseResult<EncodedScalar> {
-    _sanityCheck(buffer._storage & 0x80 != 0) // this case handled elsewhere
+    assert(buffer._storage & 0x80 != 0) // this case handled elsewhere
 
     if buffer._storage & 0b0__1100_0000__1110_0000
                       == 0b0__1000_0000__1100_0000 {
@@ -813,7 +813,7 @@ extension _UTF16Decoder {
   }
 
   internal mutating func _consume(bitCount: UInt8) -> EncodedScalar {
-    _sanityCheck(bitCount == 16)
+    assert(bitCount == 16)
     let s = buffer._storage
     buffer._storage = 0
     buffer._bitCount = 0
@@ -822,7 +822,7 @@ extension _UTF16Decoder {
 
   public // @testable
   func _parseMultipleCodeUnits() -> (isValid: Bool, bitCount: UInt8) {
-    _sanityCheck(  // this case handled elsewhere
+    assert(  // this case handled elsewhere
       !Self._isScalar(UInt16(truncatingIfNeeded: buffer._storage)))
 
     if _fastPath(buffer._storage & 0xFC00_FC00 == Self._surrogatePattern) {
@@ -855,7 +855,7 @@ extension Unicode.UTF16 : UnicodeEncoding {
     if _fastPath(source._bitCount == 16) {
       return UnicodeScalar(_unchecked: bits & 0xffff)
     }
-    _sanityCheck(source._bitCount == 32)
+    assert(source._bitCount == 32)
     let value = 0x10000 + (bits >> 16 & 0x03ff | (bits & 0x03ff) << 10)
     return UnicodeScalar(_unchecked: value)
   }