hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 08:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Swift: remove std::result_of from swift headers

Browse Source 
`std::result_of` was removed in C++20, though the actual removal from
the STL library implementations seems to depend on the version. For
example using xcode 14.2 one gets away with a deprecation warning, but
xcode 14.3 will fail.

As Swift 5.8.1 is still compiled with C++14, we cannot replace
`std::result_of` with `std::invoke_result` in the prebuilding patches
just yet, but we can do that for the extractor itself, patching the
prebuilt package.
This commit is contained in:
Paolo Tranquilli
2023-06-19 15:29:45 +02:00
parent 5cb451b040
commit 3ff7148147
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/third_party/load.bzl vendored
View File

@@ -39,6 +39,8 @@ def load_dependencies(workspace_name):
),
build_file = _build(workspace_name, "swift-llvm-support"),
sha256 = sha256,
patch_args = ["-p1"],
patches = ["@%s//swift/third_party/swift-llvm-support:patches/remove-result-of.patch" % workspace_name],
)
_github_archive(

30
swift/third_party/swift-llvm-support/patches/remove-result-of.patch vendored Normal file
View File

@@ -0,0 +1,30 @@
`std::result_of` was removed in C++20, but is still used in the Swift headers. We can't
remove it from there before prebuilding, as that is still done with C++14, but we can
replace it with `std::invoke_result` for compiling the extractor.
diff --git a/include/swift/Basic/RelativePointer.h b/include/swift/Basic/RelativePointer.h
index 73f91262afa..bdaa304c804 100644
--- a/include/swift/Basic/RelativePointer.h
+++ b/include/swift/Basic/RelativePointer.h
@@ -551,7 +551,7 @@ public:
}
template <typename... ArgTy>
- typename std::result_of<T *(ArgTy...)>::type operator()(ArgTy... arg) const {
+ typename std::invoke_result<T*, ArgTy...>::type operator()(ArgTy... arg) const {
#if SWIFT_PTRAUTH
void *ptr = this->super::getWithoutCast();
return reinterpret_cast<T *>(ptrauth_sign_unauthenticated(
diff --git a/include/swift/Basic/STLExtras.h b/include/swift/Basic/STLExtras.h
index 7fa3d0c8890..6bc891a9b63 100644
--- a/include/swift/Basic/STLExtras.h
+++ b/include/swift/Basic/STLExtras.h
@@ -405,7 +405,7 @@ class OptionalTransformIterator {
typename std::iterator_traits<Iterator>::reference;
using ResultReference =
- typename std::result_of<OptionalTransform(UnderlyingReference)>::type;
+ typename std::invoke_result<OptionalTransform, UnderlyingReference>::type;
public:
/// Used to indicate when the current iterator has already been