diff --git a/swift/extractor/infra/SwiftTagTraits.h b/swift/extractor/infra/SwiftTagTraits.h index 806ad0a5ffd1..f7825043edda 100644 --- a/swift/extractor/infra/SwiftTagTraits.h +++ b/swift/extractor/infra/SwiftTagTraits.h @@ -287,6 +287,7 @@ MAP(swift::TypeBase, TypeTag) MAP(swift::BuiltinNonDefaultDistributedActorStorageType, void) // Does not appear in AST/SIL, only used during IRGen MAP(swift::BuiltinFixedArrayType, BuiltinFixedArrayTypeTag) MAP(swift::BuiltinUnboundGenericType, void) // Only used during type resolution + MAP(swift::BuiltinImplicitActorType, void) // SIL type MAP(swift::TupleType, TupleTypeTag) MAP(swift::ReferenceStorageType, ReferenceStorageTypeTag) MAP(swift::WeakStorageType, WeakStorageTypeTag) diff --git a/swift/extractor/translators/ExprTranslator.cpp b/swift/extractor/translators/ExprTranslator.cpp index 936bf64940f4..a5ae49230b83 100644 --- a/swift/extractor/translators/ExprTranslator.cpp +++ b/swift/extractor/translators/ExprTranslator.cpp @@ -538,7 +538,7 @@ void ExprTranslator::fillSelfApplyExpr(const swift::SelfApplyExpr& expr, void ExprTranslator::fillLookupExpr(const swift::LookupExpr& expr, codeql::LookupExpr& entry) { entry.base = dispatcher.fetchLabel(expr.getBase()); - if (expr.hasDecl()) { + if (expr.hasDecl() && !expr.getDecl().getDecl()->isUnavailable()) { entry.member = dispatcher.fetchLabel(expr.getDecl().getDecl()); } } diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index d19345a18803..5881227d2fbf 100644 --- a/swift/third_party/load.bzl +++ b/swift/third_party/load.bzl @@ -5,6 +5,10 @@ load("//misc/bazel:lfs.bzl", "lfs_archive", "lfs_files") _override = { # these are used to test new artifacts. Must be empty before merging to main + "swift-prebuilt-macOS-swift-6.2.3-RELEASE-137.tar.zst": "a96536acde3a054a2528feedbb6ffa71fb7ffa6b68f0838f2f007e7474fc0b84", + "swift-prebuilt-Linux-swift-6.2.3-RELEASE-137.tar.zst": "ad8d6611bfd3c749435e44fa25a300082efb308c21c5da1305c65bd2c5d8fec4", + "resource-dir-macOS-swift-6.2.3-RELEASE-137.zip": "e358d99dab2bf07d70a06d8d4119c05ee40e33cdc659ad787595dc56cb405755", + "resource-dir-Linux-swift-6.2.3-RELEASE-137.zip": "ab0279edb35706dbd5c238f6ea29b2a275bb837e1d6485e150801551c7f0740e", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}"