From 7f3745cfcdefa1bc739e80d09e858ba4f266e86e Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Thu, 31 Oct 2024 06:22:06 +0100 Subject: [PATCH] Swift: fix `@isolated(any)` DB inconsistencies --- swift/extractor/mangler/SwiftMangler.cpp | 3 +++ swift/third_party/load.bzl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/swift/extractor/mangler/SwiftMangler.cpp b/swift/extractor/mangler/SwiftMangler.cpp index 3743ab53dcad..04e04fd6fbc7 100644 --- a/swift/extractor/mangler/SwiftMangler.cpp +++ b/swift/extractor/mangler/SwiftMangler.cpp @@ -243,6 +243,9 @@ SwiftMangledName SwiftMangler::visitAnyFunctionType(const swift::AnyFunctionType if (type->hasGlobalActor()) { ret << "_actor" << fetch(type->getGlobalActor()); } + if (type->getIsolation().isErased()) { + ret << "_isolated"; + } // TODO: see if this needs to be used in identifying types, if not it needs to be removed from // type printing in the Swift compiler code assert(type->hasExtInfo() && "type must have ext info"); diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index 312e7e84221b..dd8470a023f8 100644 --- a/swift/third_party/load.bzl +++ b/swift/third_party/load.bzl @@ -5,7 +5,7 @@ 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.tar.zst": "a016ed60ee1a534439ed4d55100ecf6b9fc739f629be20942345ac5156cb6296", + "swift-prebuilt-macOS.tar.zst": "4679ad4086ac6894e2f8a6bd71c5033941c894844809bf988dacb8af0c384416", "swift-prebuilt-Linux.tar.zst": "c45976d50670964132cef1dcf98bccd3fff809d33b2207a85cf3cfd07ec84528", "resource-dir-macOS.zip": "286e4403aa0a56641c2789e82036481535e336484f2c760bec0f42e3afe5dd87", "resource-dir-Linux.zip": "16a1760f152395377a580a994885e0877338279125834463a6a38f4006ad61ca",