Merge pull request #62880 from apple/egorzhdan/bench-remove-extensions

egorzhdan · web-flow · commit 7080f6761874 · 2023-01-06T18:27:39.000+01:00
[cxx-interop] Remove manual `std::vector` conformance in the benchmark
diff --git a/benchmark/cxx-source/CxxVectorSum.swift b/benchmark/cxx-source/CxxVectorSum.swift
@@ -126,8 +126,4 @@ public func run_CxxVectorOfU32_Sum_Swift_Reduce(_ n: Int) {
     }
     blackHole(sum)
 }
-
-extension VectorOfU32.const_iterator : Equatable, UnsafeCxxInputIterator { }
-
-extension VectorOfU32: CxxSequence {}
 #endif
diff --git a/benchmark/utils/CxxTests/CxxStdlibPerformance.h b/benchmark/utils/CxxTests/CxxStdlibPerformance.h
@@ -32,6 +32,3 @@ inline uint32_t testVector32Sum(size_t vectorSize, size_t iters) {
     }
     return sum;
 }
-
-// FIXME: remove when the templated operator == is correctly bridged.
-inline bool operator ==(const VectorOfU32::const_iterator &lhs, const VectorOfU32::const_iterator &rhs) { return lhs.base() == rhs.base(); }

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,4 @@ public func run_CxxVectorOfU32_Sum_Swift_Reduce(_ n: Int) {`
`126`	`126`	`}`
`127`	`127`	`blackHole(sum)`
`128`	`128`	`}`
`129`		`-`
`130`		`-extension VectorOfU32.const_iterator : Equatable, UnsafeCxxInputIterator { }`
`131`		`-`
`132`		`-extension VectorOfU32: CxxSequence {}`
`133`	`129`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,3 @@ inline uint32_t testVector32Sum(size_t vectorSize, size_t iters) {`
`32`	`32`	`}`
`33`	`33`	`return sum;`
`34`	`34`	`}`
`35`		`-`
`36`		`-// FIXME: remove when the templated operator == is correctly bridged.`
`37`		`-inline bool operator ==(const VectorOfU32::const_iterator &lhs, const VectorOfU32::const_iterator &rhs) { return lhs.base() == rhs.base(); }`