Skip to content

Commit 0bfe502

Browse files
committed
Swift: remove patches from the extractor
Moved elsewhere dsp-testing/codeql-swift-artifacts#3
1 parent 45e2a13 commit 0bfe502

File tree

3 files changed

+3
-29
lines changed

3 files changed

+3
-29
lines changed

misc/bazel/workspace.bzl

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
33

4-
_swift_prebuilt_version = "swift-5.7.1-RELEASE.44356.85"
4+
_swift_prebuilt_version = "swift-5.7.1-RELEASE.44428.89"
55
_swift_sha_map = {
6-
"Linux-X64": "c9f17e13cac89f097aaaa65b1bc32aac566c8e4f3b68fc18e970cc3ee31f4913",
7-
"macOS-X64": "638ac0552e9e1ccee9e276525d1ea9454256feec20bc778efa8856fd6e506987",
6+
"Linux-X64": "1fa0b62b3a87c6528bd21b3f3fa1b32ad00e2b6ff04c20652c93c7d00c4cf517",
7+
"macOS-X64": "6e1239335874cbde635ae9ca9eeb215efee4988888a75f4eda1abbcf97e4d038",
88
}
99

1010
_swift_arch_map = {
@@ -22,10 +22,6 @@ def codeql_workspace(repository_name = "codeql"):
2222
_swift_prebuilt_version,
2323
repo_arch,
2424
),
25-
patches = [
26-
"@%s//swift/third_party/swift-llvm-support:patches/remove_getFallthrougDest_assert.patch" % repository_name,
27-
],
28-
patch_args = ["-p1"],
2925
build_file = "@%s//swift/third_party/swift-llvm-support:BUILD.swift-prebuilt.bazel" % repository_name,
3026
sha256 = sha256,
3127
)

swift/extractor/infra/SwiftDispatcher.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,6 @@ class SwiftDispatcher {
215215
// Emits a Location TRAP entry and attaches it to a `Locatable` trap label
216216
template <typename Locatable>
217217
void attachLocation(Locatable* locatable, TrapLabel<LocatableTag> locatableLabel) {
218-
// Swift 5.7.1 causing a crash when the Swift compiler uses .back() of and empty
219-
// getPatternList() when getting the source location.
220-
// So far this only observed with the entities coming from precompiled modules, so they
221-
// should not have locations anyway.
222-
if constexpr (std::is_base_of<swift::Decl, Locatable>::value) {
223-
if (auto* decl = llvm::dyn_cast<swift::PatternBindingDecl>(locatable)) {
224-
if (decl->getPatternList().empty()) {
225-
return;
226-
}
227-
}
228-
}
229218
attachLocation(locatable->getStartLoc(), locatable->getEndLoc(), locatableLabel);
230219
}
231220

swift/third_party/swift-llvm-support/patches/remove_getFallthrougDest_assert.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)