Skip to content

Commit cc9c4fa

Browse files
authored
Merge pull request #20413 from moiseev/no-guards
[stdlib] Fix the abi checker test for both assert and no-assert builds
2 parents 1aeae26 + 938094c commit cc9c4fa

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

stdlib/public/core/Runtime.swift.gyb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ func _stdlib_atomicLoadARCRef(
118118
// These pieces are used in ThreadLocalStorage.swift in debug builds.
119119
// For tests, see similar functions from SwiftPrivate/AtomicInt.swift.gyb
120120
//===----------------------------------------------------------------------===//
121-
#if INTERNAL_CHECKS_ENABLED
122121
internal func _swift_stdlib_atomicLoadInt(
123122
object target: UnsafeMutablePointer<Int>) -> Int {
124123
#if arch(i386) || arch(arm)
@@ -133,7 +132,6 @@ internal func _swift_stdlib_atomicLoadInt(
133132
% for bits in [ 32, 64 ]:
134133

135134
// Warning: no overflow checking.
136-
@inlinable // FIXME(sil-serialize-all)
137135
internal func _swift_stdlib_atomicFetchAddInt${bits}(
138136
object target: UnsafeMutablePointer<Int${bits}>,
139137
operand: Int${bits}) -> Int${bits} {
@@ -162,7 +160,6 @@ internal func _swift_stdlib_atomicFetchAddInt(
162160
#endif
163161
return Int(value)
164162
}
165-
#endif // INTERNAL_CHECKS_ENABLED
166163
//===----------------------------------------------------------------------===//
167164

168165
//===----------------------------------------------------------------------===//

test/api-digester/Outputs/stability-stdlib-abi.swift.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Func _stdlib_atomicCompareExchangeStrongInt64(object:expected:desired:) has been
2121
Func _stdlib_atomicCompareExchangeStrongUInt32(object:expected:desired:) has been removed
2222
Func _stdlib_atomicCompareExchangeStrongUInt64(object:expected:desired:) has been removed
2323
Func _swift_stdlib_atomicFetchAddInt(object:operand:) has been removed
24+
Func _swift_stdlib_atomicFetchAddInt32(object:operand:) has been removed
25+
Func _swift_stdlib_atomicFetchAddInt64(object:operand:) has been removed
2426
Func _swift_stdlib_atomicFetchAddUInt32(object:operand:) has been removed
2527
Func _swift_stdlib_atomicFetchAddUInt64(object:operand:) has been removed
2628
Func _swift_stdlib_atomicFetchAndInt(object:operand:) has been removed

0 commit comments

Comments
 (0)