Skip to content

Commit ca26019

Browse files
author
Gabor Horvath
committed
[cxx-interop] Reenable C++ benchmarks
The root cause was wrong availability for some conversions between Swift and C++ spans. rdar://149402670
1 parent bc07600 commit ca26019

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

benchmark/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ set(SWIFT_BENCH_MODULES
210210
single-source/WordCount
211211
single-source/XorLoop
212212
cxx-source/CreateObjects
213-
# cxx-source/CxxSetToCollection
214-
# cxx-source/CxxSpanTests
215-
# cxx-source/CxxStringConversion
216-
# cxx-source/CxxVectorSum
213+
cxx-source/CxxSetToCollection
214+
cxx-source/CxxSpanTests
215+
cxx-source/CxxStringConversion
216+
cxx-source/CxxVectorSum
217217
# TODO: rdar://92120528
218218
# cxx-source/ReadAccessor
219219
)

benchmark/utils/main.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ import CountAlgo
5757
import CreateObjects
5858
// rdar://128520766
5959
// import CxxSetToCollection
60-
// import CxxSpanTests
61-
// import CxxStringConversion
60+
import CxxSpanTests
61+
import CxxStringConversion
6262
// rdar://128520766
6363
// import CxxVectorSum
6464
import DataBenchmarks
@@ -257,8 +257,8 @@ register(ClassArrayGetter.benchmarks)
257257
register(CreateObjects.benchmarks)
258258
// rdar://128520766
259259
// register(CxxSetToCollection.benchmarks)
260-
// register(CxxSpanTests.benchmarks)
261-
// register(CxxStringConversion.benchmarks)
260+
register(CxxSpanTests.benchmarks)
261+
register(CxxStringConversion.benchmarks)
262262
// rdar://128520766
263263
// register(CxxVectorSum.benchmarks)
264264
register(DataBenchmarks.benchmarks)

stdlib/public/Cxx/CxxSpan.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ extension CxxSpan {
8888
unsafe self.init(unsafeMutableBufferPointer.baseAddress!, Size(unsafeMutableBufferPointer.count))
8989
}
9090

91-
@available(SwiftStdlib 6.2, *)
91+
@available(SwiftStdlib 5.0, *)
9292
@inlinable
9393
@unsafe
9494
public init(_ span: Span<Element>) {
@@ -99,7 +99,7 @@ extension CxxSpan {
9999
}
100100
}
101101

102-
@available(SwiftStdlib 6.2, *)
102+
@available(SwiftStdlib 5.0, *)
103103
extension Span {
104104
@_alwaysEmitIntoClient
105105
@unsafe
@@ -115,7 +115,7 @@ extension Span {
115115
}
116116
}
117117

118-
@available(SwiftStdlib 6.2, *)
118+
@available(SwiftStdlib 5.0, *)
119119
extension MutableSpan {
120120
@_alwaysEmitIntoClient
121121
@unsafe

0 commit comments

Comments
 (0)