From f7de0abe602d2c4695b11604201e97637bf4673c Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 8 Apr 2026 15:32:43 +0200
Subject: [PATCH] Swift: Fix `BuiltinFixedArrayType` mangling

---
 swift/extractor/mangler/SwiftMangler.cpp      | 11 +++-
 swift/extractor/mangler/SwiftMangler.h        |  1 +
 .../type/BuiltinType/BuiltinType.expected     | 61 -------------------
 3 files changed, 9 insertions(+), 64 deletions(-)

diff --git a/swift/extractor/mangler/SwiftMangler.cpp b/swift/extractor/mangler/SwiftMangler.cpp
index 8d7d2a8a065..76735bdc09f 100644
--- a/swift/extractor/mangler/SwiftMangler.cpp
+++ b/swift/extractor/mangler/SwiftMangler.cpp
@@ -202,6 +202,14 @@ SwiftMangledName SwiftMangler::visitBuiltinType(const swift::BuiltinType* type)
   return initMangled(type) << type->getTypeName(buffer, /* prependBuiltinNamespace= */ false);
 }
 
+SwiftMangledName SwiftMangler::visitBuiltinFixedArrayType(
+    const swift::BuiltinFixedArrayType* type) {
+  auto ret = visitBuiltinType(type);
+  ret << fetch(type->getSize());
+  ret << fetch(type->getElementType());
+  return ret;
+}
+
 SwiftMangledName SwiftMangler::visitAnyGenericType(const swift::AnyGenericType* type) {
   auto ret = initMangled(type);
   auto decl = type->getDecl();
@@ -240,9 +248,6 @@ SwiftMangledName SwiftMangler::visitAnyFunctionType(const swift::AnyFunctionType
     if (flags.isNonEphemeral()) {
       ret << "_nonephermeral";
     }
-    if (flags.isIsolated()) {
-      ret << "_isolated";
-    }
     if (flags.isSending()) {
       ret << "_sending";
     }
diff --git a/swift/extractor/mangler/SwiftMangler.h b/swift/extractor/mangler/SwiftMangler.h
index caf70718633..bb369101388 100644
--- a/swift/extractor/mangler/SwiftMangler.h
+++ b/swift/extractor/mangler/SwiftMangler.h
@@ -71,6 +71,7 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitModuleType(const swift::ModuleType* type);
   SwiftMangledName visitTupleType(const swift::TupleType* type);
   SwiftMangledName visitBuiltinType(const swift::BuiltinType* type);
+  SwiftMangledName visitBuiltinFixedArrayType(const swift::BuiltinFixedArrayType* type);
   SwiftMangledName visitAnyGenericType(const swift::AnyGenericType* type);
 
   // shouldn't be required, but they forgot to link `NominalType` to its direct superclass
diff --git a/swift/ql/test/extractor-tests/generated/type/BuiltinType/BuiltinType.expected b/swift/ql/test/extractor-tests/generated/type/BuiltinType/BuiltinType.expected
index fe0d3372c49..1b64e9f4a22 100644
--- a/swift/ql/test/extractor-tests/generated/type/BuiltinType/BuiltinType.expected
+++ b/swift/ql/test/extractor-tests/generated/type/BuiltinType/BuiltinType.expected
@@ -3,69 +3,8 @@
 | Builtin.FPIEEE32 | BuiltinFloatType | getName: | FPIEEE32 | getCanonicalType: | Builtin.FPIEEE32 |
 | Builtin.FPIEEE64 | BuiltinFloatType | getName: | FPIEEE64 | getCanonicalType: | Builtin.FPIEEE64 |
 | Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<4, Int> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<4, Int> |
 | Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<N, T> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<N, T> |
 | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<4, Int> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<N, T> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<\u03c4_0_0, \u03c4_0_1> | getCanonicalType: | Builtin.FixedArray<count, Element> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<4, Int> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<N, T> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<\u03c4_0_0, \u03c4_0_1> |
-| Builtin.FixedArray<count, Element> | BuiltinFixedArrayType | getName: | FixedArray<count, Element> | getCanonicalType: | Builtin.FixedArray<count, Element> |
 | Builtin.IntLiteral | BuiltinIntegerLiteralType | getName: | IntLiteral | getCanonicalType: | Builtin.IntLiteral |
 | Builtin.Job | BuiltinJobType | getName: | Job | getCanonicalType: | Builtin.Job |
 | Builtin.NativeObject | BuiltinNativeObjectType | getName: | NativeObject | getCanonicalType: | Builtin.NativeObject |