diff --git a/misc/bazel/workspace.bzl b/misc/bazel/workspace.bzl index df5995b499b..d0aee216668 100644 --- a/misc/bazel/workspace.bzl +++ b/misc/bazel/workspace.bzl @@ -1,10 +1,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") -_swift_prebuilt_version = "swift-5.7.1-RELEASE.44356.85" +_swift_prebuilt_version = "swift-5.7.1-RELEASE.44428.89" _swift_sha_map = { - "Linux-X64": "c9f17e13cac89f097aaaa65b1bc32aac566c8e4f3b68fc18e970cc3ee31f4913", - "macOS-X64": "638ac0552e9e1ccee9e276525d1ea9454256feec20bc778efa8856fd6e506987", + "Linux-X64": "1fa0b62b3a87c6528bd21b3f3fa1b32ad00e2b6ff04c20652c93c7d00c4cf517", + "macOS-X64": "6e1239335874cbde635ae9ca9eeb215efee4988888a75f4eda1abbcf97e4d038", } _swift_arch_map = { @@ -22,10 +22,6 @@ def codeql_workspace(repository_name = "codeql"): _swift_prebuilt_version, repo_arch, ), - patches = [ - "@%s//swift/third_party/swift-llvm-support:patches/remove_getFallthrougDest_assert.patch" % repository_name, - ], - patch_args = ["-p1"], build_file = "@%s//swift/third_party/swift-llvm-support:BUILD.swift-prebuilt.bazel" % repository_name, sha256 = sha256, ) diff --git a/swift/extractor/infra/SwiftDispatcher.h b/swift/extractor/infra/SwiftDispatcher.h index 0175bba1e6b..991511e300c 100644 --- a/swift/extractor/infra/SwiftDispatcher.h +++ b/swift/extractor/infra/SwiftDispatcher.h @@ -215,17 +215,6 @@ class SwiftDispatcher { // Emits a Location TRAP entry and attaches it to a `Locatable` trap label template void attachLocation(Locatable* locatable, TrapLabel locatableLabel) { - // Swift 5.7.1 causing a crash when the Swift compiler uses .back() of and empty - // getPatternList() when getting the source location. - // So far this only observed with the entities coming from precompiled modules, so they - // should not have locations anyway. - if constexpr (std::is_base_of::value) { - if (auto* decl = llvm::dyn_cast(locatable)) { - if (decl->getPatternList().empty()) { - return; - } - } - } attachLocation(locatable->getStartLoc(), locatable->getEndLoc(), locatableLabel); } diff --git a/swift/third_party/swift-llvm-support/patches/remove_getFallthrougDest_assert.patch b/swift/third_party/swift-llvm-support/patches/remove_getFallthrougDest_assert.patch deleted file mode 100644 index c16942a807c..00000000000 --- a/swift/third_party/swift-llvm-support/patches/remove_getFallthrougDest_assert.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru a/include/swift/AST/Stmt.h b/include/swift/AST/Stmt.h ---- a/include/swift/AST/Stmt.h 2022-09-21 12:56:54.000000000 +0200 -+++ b/include/swift/AST/Stmt.h 2022-11-04 14:39:18.407971007 +0100 -@@ -920,7 +920,6 @@ - /// Get the CaseStmt block to which the fallthrough transfers control. - /// Set during Sema. - CaseStmt *getFallthroughDest() const { -- assert(FallthroughDest && "fallthrough dest is not set until Sema"); - return FallthroughDest; - } - void setFallthroughDest(CaseStmt *C) {