diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index 8d2fb9a2ebc..a666c64948d 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -539,8 +539,9 @@ lib/codeql/swift/elements/type/BoundGenericType.qll 089e5e8d09c62a23d575dcab68cd
 lib/codeql/swift/elements/type/BuiltinBridgeObjectType.qll b0064e09b53efe801b0bf950ff00698a84e2f714e853e4859ed5f3246025a1bd aa14b6ae2ec510c4ddd2cc073bf971809536ab8fd8763fd05bd171b0bbe83860
 lib/codeql/swift/elements/type/BuiltinDefaultActorStorageType.qll e867a9d0b2c61b7eb61f5143c78e31f8d98d3245d79e0e3281d4c172175f496b 265e87f2e37ca968af572cc619294d1ee91dd66ebb0d1bb1ba9ab7159de52f0b
 lib/codeql/swift/elements/type/BuiltinExecutorType.qll 2b141553bbc02a00d97579ba9d0e38fa0978d40ce954b0caf64826aa259dbc08 a81465fd0e87ad5b8e418d8f21c337b3e96388a3b92b3332f0d6b0ff7663e5c7
-lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll 24a57f15a53070e6308841cd5dac4d55059e84d9fb18a77eec1130647dcdc97c 9f4167ef5190cbeee71abd068bdb0a280b690a16349cd408244d4cf9edfb357a
+lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll 9d32f49cd7169d12c00cde31433897e8f8ada62132430020dc2525a97673cf57 0236f494f6ce77b04a80e405d11f5b39b1e45ea9c50a6ee42dd96407516b448f
 lib/codeql/swift/elements/type/BuiltinFloatType.qll 81f49325077b75cea682904ddab24d1b2fdc5c93b0b28830c08e866d5c9307a7 e26a348d66e3824ccd92729624ce2b2ebc82a844aa47035e0a963a62b08b772d
+lib/codeql/swift/elements/type/BuiltinGenericType.qll 108682444f5f28b64b7caa16254fd4d7418813bc9e7f6a17477b13fe37293d40 de3fa330516684f0cfd848101b3a93f83b2d8a9f00b35dae70d2b56cb5414923
 lib/codeql/swift/elements/type/BuiltinIntegerLiteralType.qll 34ee35733cf26f90d799a79f8a2362b199ea2ecb6ba83eb5678dda9eb3ed255f e33fdb27d3c22d441277b66ba74136cb88e1da25a2146391b258c68f7fbf5dd3
 lib/codeql/swift/elements/type/BuiltinIntegerType.qll b931e79a40fb379a8de377ae4ea1c85befb7b07dbfe913f0ea7f5adf5514b217 5d7e6f21284b8c5ff70773bb64f896a40541c9064bfdd336798ccfda4cb4fb9e
 lib/codeql/swift/elements/type/BuiltinJobType.qll 4b4cab766d8476efd7482ab47f6fdd63fd90a322e1e791949351092f126f5b46 779ceee86a778b59a3feb5247603fe07e4a73068a7990e25c31dd93ba0dd718d
@@ -623,6 +624,7 @@ lib/codeql/swift/elements/type/internal/BuiltinFixedArrayTypeConstructor.qll 0d5
 lib/codeql/swift/elements/type/internal/BuiltinFixedArrayTypeImpl.qll 6b69ba8b271646bcd699e338f41c186f3e4e7d401830918407e392312b2f0ad1 ecaca3d762264423094f7c2cb63e33b5d72d970946766eec33d984fa977950b4
 lib/codeql/swift/elements/type/internal/BuiltinFloatTypeConstructor.qll f1dab7b9d36213e57083a6effec1b2d859553831394c0e746c592c96a20db6de cceeaa864cfc84511b3cdad6a88d44fc14ea1c8e38db72b0854c3f217a3f9c44
 lib/codeql/swift/elements/type/internal/BuiltinFloatTypeImpl.qll 1dc7f7817c4a238751875b0cee98d060a1ea975a22fd90ceef0f9874b85824d6 d98f743c28174fb3294f0ff60232600a4fc80aeefe72e5cc15bb56e09880ec1e
+lib/codeql/swift/elements/type/internal/BuiltinGenericTypeImpl.qll 2735ef1521c399540ef43fc75aa62b4bbb1871446d87304c9e3a991ad16a96f4 263e41354843afc5d1f57bd2f50610992d05d77ceb1c2079587ddd3a1eceffc5
 lib/codeql/swift/elements/type/internal/BuiltinIntegerLiteralTypeConstructor.qll 3885775f78e18286aa8dc99ab5b6f386a278b34b47f93da28d67faac918e6087 93be2ad0b7235bab613b74582bc1de0ca8b2a4da7a387d09a9b8ef9b38095534
 lib/codeql/swift/elements/type/internal/BuiltinIntegerLiteralTypeImpl.qll 7f078bd837acddd0e835f78b0ae6e0381c9c587e82edc61cf78986ce0081e314 f141415be39f8a5f09d4a90cc5d841f90385c3be8781c0bafbad0871681ec8a3
 lib/codeql/swift/elements/type/internal/BuiltinIntegerTypeConstructor.qll 2c5a7884c5c8c852d81b6ce03f9c6cc036944428731e3a73208c0d2047b72611 abd29915698109395a4751999aa334ba3c020f20372a5dff213acdd672d024a9
@@ -721,7 +723,7 @@ lib/codeql/swift/elements/type/internal/UnresolvedTypeImpl.qll ee1499dd568753898
 lib/codeql/swift/elements/type/internal/VariadicSequenceTypeConstructor.qll fc74a5a2a2effa28ef24509b20ee4373d97cf6e8c71840121bb031c6adedf584 c9b2effc1d01c13c5e6a74a111122fa79a2f6554dda3cb016d68ba397e566ec4
 lib/codeql/swift/elements/type/internal/WeakStorageTypeConstructor.qll 5fdce3716aba6318522174a2c455a63480970222ae81c732fb19c6dd3ae2d271 60ea79d6943e129deba0deccb566cf9d73f78398b0f7f0212674d91287d6b2ae
 lib/codeql/swift/elements/type/internal/WeakStorageTypeImpl.qll 74f79b458f3204ec2519bd654de21bc4fb6b76816bd8ca01990fe897563a1383 34e1810f74cecda5b580ed050438ae1d914b97a36b8f4e2de1c25254c0cac633
-lib/codeql/swift/elements.qll ec0104a658330f595eac7dd8578d996905a6c2cf78765744c3967a8f3d1c3273 ec0104a658330f595eac7dd8578d996905a6c2cf78765744c3967a8f3d1c3273
+lib/codeql/swift/elements.qll 70e20ccd31c9247904fb5ef00ccbda5a6d29c680e88b0ed238f4b4546abf5f33 70e20ccd31c9247904fb5ef00ccbda5a6d29c680e88b0ed238f4b4546abf5f33
 lib/codeql/swift/generated/AstNode.qll 6fb80e9b230a1e3ae8193af40744f253d5cc81dc4239156924e5ab606c491efc e5c28418e9a38bde08f323a3986a199620189fc4a8a4dc8f670610a5d3d65b99
 lib/codeql/swift/generated/AvailabilityInfo.qll e3a5274c43e72ff124b6988fd8be0c83a41b89337e11104150dd0ca7f51d8a11 889563791ca8d9758dbbccf64a0731c4bdbf721cad32bc6cd723f1072b6aa1de
 lib/codeql/swift/generated/AvailabilitySpec.qll 1bd2a0ee085f802c99090e681ab3339fc5013024d79deef39f376de12ab76d37 658f2eb51860726cfa6808b3e3501d624e0734750d1420f7a25c89782f1f6c7e
@@ -737,10 +739,10 @@ lib/codeql/swift/generated/KeyPathComponent.qll e11dcf952045b5e6062e24c23515cff9
 lib/codeql/swift/generated/Locatable.qll 1d37fa20de71c0b9986bfd7a7c0cb82ab7bf3fda2d2008700f955ad82ce109a7 e97d4d4fb8a4800e0008cc00f60c8ed9b1ebd5f1140fd85e68b034616178d721
 lib/codeql/swift/generated/Location.qll 5e20316c3e480ddfe632b7e88e016c19f10a67df1f6ae9c8f128755a6907d6f5 5a0af2d070bcb2ed53d6d0282bf9c60dc64c2dce89c21fdd485e9c7893c1c8fa
 lib/codeql/swift/generated/MacroRole.qll facf907e75490d69cd401c491215e4719324d751f40ea46c86ccf24cf3663c1f 969d8d4b44e3f1a9c193a152a4d83a303e56d2dbb871fc920c47a33f699cf018
-lib/codeql/swift/generated/ParentChild.qll 7fdc133bdec6cc223d5ee85e757b02c5d2e1ab121bcf269bb48c8a12a31a61e9 d8dd6e21d290a293db4db510b1523a9ea428b12f48b7574f03acf00b9ca065ef
+lib/codeql/swift/generated/ParentChild.qll 669d39245f2cb735cfd4bcebdb551ef8f334fef5297c5834a8b09ebfa655856e 59b283c8a30b6b364c853302ab919ea713e0289e7b793b08b46fc87178d14a6a
 lib/codeql/swift/generated/PureSynthConstructors.qll bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4 bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4
-lib/codeql/swift/generated/Raw.qll 6adc2ec210e91051b6d3d6c84117b827f10dbea682a18b69348d1c6cdc53629c 9ff02fcca7a7b83c85303ffc6daa00ea392da6ce1f9cb389b5053b34d4a45e4c
-lib/codeql/swift/generated/Synth.qll b0084d1f573ba1b10ec8a8fab169b15f15866ecb9a6aeeeac81553a442be28e3 09efe455f3fd6b8b983b30efbd797f09af46e6f5a1a1075801650528999ed938
+lib/codeql/swift/generated/Raw.qll c209a47a66f24f54bdfb5adf591dd171b2dbe9e30936a2355160526b9f756399 378e7492ca885f46092628ca26afa76c909deb88f092fe56404fea8f94d133b0
+lib/codeql/swift/generated/Synth.qll e30b50d2645d9c36719d81f1be70712c7c6e89a3f5b4a5ae894411e045d05bff 9bd0c9c90532db97cde9553dde4089b7cf12c462c690d853fa40cb36ea112c21
 lib/codeql/swift/generated/SynthConstructors.qll c40f01e1331bdbe238620a41d17409cefe34a6b23066708ef5d74f8631b54f48 c40f01e1331bdbe238620a41d17409cefe34a6b23066708ef5d74f8631b54f48
 lib/codeql/swift/generated/UnknownFile.qll 247ddf2ebb49ce5ed4bf7bf91a969ddff37de6c78d43d8affccaf7eb586e06f2 452b29f0465ef45e978ef8b647b75e5a2a1e53f2a568fc003bc8f52f73b3fa4d
 lib/codeql/swift/generated/UnknownLocation.qll d871000b4f53ffca4f67ea23ca5626e5dcce125d62a4d4b9969e08cc974af6fc b05971d7774e60790362fb810fb7086314f40a2de747b8cb1bc823ec6494a4dd
@@ -978,8 +980,9 @@ lib/codeql/swift/generated/type/BoundGenericType.qll 5e7a2210b766437ca301f9675f7
 lib/codeql/swift/generated/type/BuiltinBridgeObjectType.qll 97f30768a8788ec4547ce8a8f06fdd165286177e3819bf2e6590b9479f5bada4 ea3161c34d1d18783b38deac43c73048e4510015307d93f77cd95c149e988846
 lib/codeql/swift/generated/type/BuiltinDefaultActorStorageType.qll 10e49de9a8bc3e67285c111f7869c8baceb70e478661d5557ebc8c86f41b4aec 1a0ce85eb325f666fbc2ac49c6f994efd552de6f2105e0a7ba9a10e39f3d1591
 lib/codeql/swift/generated/type/BuiltinExecutorType.qll 8f58d4d413910aded894bfa9b54748adfc2b78f4ee271ac6db5f5b0214f36a66 69da70d76146155529b7b2426b3a459abe318f887240aac1aed5719fda5f386a
-lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll 9bd26596da9137b07324222c9ed39ec0781e44673314fba96a0c7cf16f65cc7d cc2d40961b070a89f3350ab95b92ae33372277e499d7b2a9ea34721cc1fe1923
+lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll 2ae9d1ef215c725bc27f69d25247d360ee8aa0aa5a757df6b8e9734821084435 2f1caacf0f95c8f863296f0cc0a56abac4bf58ddc68e9ed63b5d8672fd21172d
 lib/codeql/swift/generated/type/BuiltinFloatType.qll 6306a806107bba052fe0b1335c8c4d4391cdb6aa5f42f14c70743113928c4c36 3265d571630c0437e5d81ba20a0b6112b7e88ee3ffca737557186001cf8aa04a
+lib/codeql/swift/generated/type/BuiltinGenericType.qll 6cd1b5da102e221f25a301c284ccc9cbd64d595596787df1a4fd3f2a92ded077 3ae4c8676a868205c5334646e395b8fc4e561ee2f4c115003ae2f4ed83197b76
 lib/codeql/swift/generated/type/BuiltinIntegerLiteralType.qll 3f49aac9b81c440b902a658294cf95aff5cb79b0d6cee8b1abd8a08ad45c7966 6c184dcf5d9376f193f07fe4722ea7cab51f1dfdef4d72c3042842d73cca31fe
 lib/codeql/swift/generated/type/BuiltinIntegerType.qll 3cfcbc4ebea6051d1f6dedcf098888c72c02bf697cebb52a0060c1885bea61f0 1c78df7a184e3615024d6e361b88dd619828a0aa7d342564610a95b02cc67d1e
 lib/codeql/swift/generated/type/BuiltinJobType.qll dc0e1932e972936001b1d688d6e70d7395184eef3c4242cebf3a2608d6607785 e5573304f6043f79cfc28e35744fd390eaebcb86a6f2758cc96aba588c1b8cb9
diff --git a/swift/ql/.gitattributes b/swift/ql/.gitattributes
index 37f29b6947e..212221509d0 100644
--- a/swift/ql/.gitattributes
+++ b/swift/ql/.gitattributes
@@ -543,6 +543,7 @@
 /lib/codeql/swift/elements/type/BuiltinExecutorType.qll linguist-generated
 /lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll linguist-generated
 /lib/codeql/swift/elements/type/BuiltinFloatType.qll linguist-generated
+/lib/codeql/swift/elements/type/BuiltinGenericType.qll linguist-generated
 /lib/codeql/swift/elements/type/BuiltinIntegerLiteralType.qll linguist-generated
 /lib/codeql/swift/elements/type/BuiltinIntegerType.qll linguist-generated
 /lib/codeql/swift/elements/type/BuiltinJobType.qll linguist-generated
@@ -625,6 +626,7 @@
 /lib/codeql/swift/elements/type/internal/BuiltinFixedArrayTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/BuiltinFloatTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/BuiltinFloatTypeImpl.qll linguist-generated
+/lib/codeql/swift/elements/type/internal/BuiltinGenericTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/BuiltinIntegerLiteralTypeConstructor.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/BuiltinIntegerLiteralTypeImpl.qll linguist-generated
 /lib/codeql/swift/elements/type/internal/BuiltinIntegerTypeConstructor.qll linguist-generated
@@ -982,6 +984,7 @@
 /lib/codeql/swift/generated/type/BuiltinExecutorType.qll linguist-generated
 /lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll linguist-generated
 /lib/codeql/swift/generated/type/BuiltinFloatType.qll linguist-generated
+/lib/codeql/swift/generated/type/BuiltinGenericType.qll linguist-generated
 /lib/codeql/swift/generated/type/BuiltinIntegerLiteralType.qll linguist-generated
 /lib/codeql/swift/generated/type/BuiltinIntegerType.qll linguist-generated
 /lib/codeql/swift/generated/type/BuiltinJobType.qll linguist-generated
diff --git a/swift/ql/lib/codeql/swift/elements.qll b/swift/ql/lib/codeql/swift/elements.qll
index bdffeba5261..6a39c465778 100644
--- a/swift/ql/lib/codeql/swift/elements.qll
+++ b/swift/ql/lib/codeql/swift/elements.qll
@@ -252,6 +252,7 @@ import codeql.swift.elements.type.BuiltinDefaultActorStorageType
 import codeql.swift.elements.type.BuiltinExecutorType
 import codeql.swift.elements.type.BuiltinFixedArrayType
 import codeql.swift.elements.type.BuiltinFloatType
+import codeql.swift.elements.type.BuiltinGenericType
 import codeql.swift.elements.type.BuiltinIntegerLiteralType
 import codeql.swift.elements.type.BuiltinIntegerType
 import codeql.swift.elements.type.BuiltinJobType
diff --git a/swift/ql/lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll b/swift/ql/lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll
index bf523a0a785..996c38d127b 100644
--- a/swift/ql/lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll
+++ b/swift/ql/lib/codeql/swift/elements/type/BuiltinFixedArrayType.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.BuiltinFixedArrayTypeImpl
-import codeql.swift.elements.type.BuiltinType
+import codeql.swift.elements.type.BuiltinGenericType
 
 /**
  * A builtin type representing N values stored contiguously.
diff --git a/swift/ql/lib/codeql/swift/elements/type/BuiltinGenericType.qll b/swift/ql/lib/codeql/swift/elements/type/BuiltinGenericType.qll
new file mode 100644
index 00000000000..4513423fd60
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/BuiltinGenericType.qll
@@ -0,0 +1,12 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the public class `BuiltinGenericType`.
+ */
+
+private import internal.BuiltinGenericTypeImpl
+import codeql.swift.elements.type.BuiltinType
+
+/**
+ * A builtin generic type.
+ */
+final class BuiltinGenericType = Impl::BuiltinGenericType;
diff --git a/swift/ql/lib/codeql/swift/elements/type/internal/BuiltinGenericTypeImpl.qll b/swift/ql/lib/codeql/swift/elements/type/internal/BuiltinGenericTypeImpl.qll
new file mode 100644
index 00000000000..0e475d64f01
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/elements/type/internal/BuiltinGenericTypeImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen/codegen.py, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `BuiltinGenericType`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.swift.generated.type.BuiltinGenericType
+
+/**
+ * INTERNAL: This module contains the customizable definition of `BuiltinGenericType` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A builtin generic type.
+   */
+  class BuiltinGenericType extends Generated::BuiltinGenericType { }
+}
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
index efed12bb5fe..424fd7af75e 100644
--- a/swift/ql/lib/codeql/swift/generated/ParentChild.qll
+++ b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -2972,12 +2972,6 @@ private module Impl {
     none()
   }
 
-  private Element getImmediateChildOfBuiltinFixedArrayType(
-    BuiltinFixedArrayType e, int index, string partialPredicateCall
-  ) {
-    none()
-  }
-
   private Element getImmediateChildOfBuiltinFloatType(
     BuiltinFloatType e, int index, string partialPredicateCall
   ) {
@@ -3084,6 +3078,12 @@ private module Impl {
     none()
   }
 
+  private Element getImmediateChildOfBuiltinFixedArrayType(
+    BuiltinFixedArrayType e, int index, string partialPredicateCall
+  ) {
+    none()
+  }
+
   private Element getImmediateChildOfBuiltinIntegerLiteralType(
     BuiltinIntegerLiteralType e, int index, string partialPredicateCall
   ) {
@@ -3636,8 +3636,6 @@ private module Impl {
     or
     result = getImmediateChildOfBuiltinExecutorType(e, index, partialAccessor)
     or
-    result = getImmediateChildOfBuiltinFixedArrayType(e, index, partialAccessor)
-    or
     result = getImmediateChildOfBuiltinFloatType(e, index, partialAccessor)
     or
     result = getImmediateChildOfBuiltinJobType(e, index, partialAccessor)
@@ -3674,6 +3672,8 @@ private module Impl {
     or
     result = getImmediateChildOfWeakStorageType(e, index, partialAccessor)
     or
+    result = getImmediateChildOfBuiltinFixedArrayType(e, index, partialAccessor)
+    or
     result = getImmediateChildOfBuiltinIntegerLiteralType(e, index, partialAccessor)
     or
     result = getImmediateChildOfBuiltinIntegerType(e, index, partialAccessor)
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
index 714579218bc..c2c65234cd4 100644
--- a/swift/ql/lib/codeql/swift/generated/Raw.qll
+++ b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -6291,18 +6291,6 @@ module Raw {
     none()
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A builtin type representing N values stored contiguously.
-   */
-  class BuiltinFixedArrayType extends @builtin_fixed_array_type, BuiltinType {
-    override string toString() { result = "BuiltinFixedArrayType" }
-  }
-
-  private Element getImmediateChildOfBuiltinFixedArrayType(BuiltinFixedArrayType e, int index) {
-    none()
-  }
-
   /**
    * INTERNAL: Do not use.
    */
@@ -6312,6 +6300,12 @@ module Raw {
 
   private Element getImmediateChildOfBuiltinFloatType(BuiltinFloatType e, int index) { none() }
 
+  /**
+   * INTERNAL: Do not use.
+   * A builtin generic type.
+   */
+  class BuiltinGenericType extends @builtin_generic_type, BuiltinType { }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -6537,6 +6531,18 @@ module Raw {
     int getNumberOfArgTypes() { result = count(int i | bound_generic_type_arg_types(this, i, _)) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A builtin type representing N values stored contiguously.
+   */
+  class BuiltinFixedArrayType extends @builtin_fixed_array_type, BuiltinGenericType {
+    override string toString() { result = "BuiltinFixedArrayType" }
+  }
+
+  private Element getImmediateChildOfBuiltinFixedArrayType(BuiltinFixedArrayType e, int index) {
+    none()
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -7224,8 +7230,6 @@ module Raw {
     or
     result = getImmediateChildOfBuiltinExecutorType(e, index)
     or
-    result = getImmediateChildOfBuiltinFixedArrayType(e, index)
-    or
     result = getImmediateChildOfBuiltinFloatType(e, index)
     or
     result = getImmediateChildOfBuiltinJobType(e, index)
@@ -7262,6 +7266,8 @@ module Raw {
     or
     result = getImmediateChildOfWeakStorageType(e, index)
     or
+    result = getImmediateChildOfBuiltinFixedArrayType(e, index)
+    or
     result = getImmediateChildOfBuiltinIntegerLiteralType(e, index)
     or
     result = getImmediateChildOfBuiltinIntegerType(e, index)
diff --git a/swift/ql/lib/codeql/swift/generated/Synth.qll b/swift/ql/lib/codeql/swift/generated/Synth.qll
index 27508df94e9..cd847f3e6af 100644
--- a/swift/ql/lib/codeql/swift/generated/Synth.qll
+++ b/swift/ql/lib/codeql/swift/generated/Synth.qll
@@ -1392,12 +1392,17 @@ module Synth {
   class TBoundGenericType =
     TBoundGenericClassType or TBoundGenericEnumType or TBoundGenericStructType;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TBuiltinGenericType = TBuiltinFixedArrayType;
+
   /**
    * INTERNAL: Do not use.
    */
   class TBuiltinType =
     TAnyBuiltinIntegerType or TBuiltinBridgeObjectType or TBuiltinDefaultActorStorageType or
-        TBuiltinExecutorType or TBuiltinFixedArrayType or TBuiltinFloatType or TBuiltinJobType or
+        TBuiltinExecutorType or TBuiltinFloatType or TBuiltinGenericType or TBuiltinJobType or
         TBuiltinNativeObjectType or TBuiltinRawPointerType or TBuiltinRawUnsafeContinuationType or
         TBuiltinUnsafeValueBufferType or TBuiltinVectorType;
 
@@ -4291,6 +4296,14 @@ module Synth {
     result = convertBoundGenericStructTypeFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TBuiltinGenericType`, if possible.
+   */
+  TBuiltinGenericType convertBuiltinGenericTypeFromRaw(Raw::Element e) {
+    result = convertBuiltinFixedArrayTypeFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TBuiltinType`, if possible.
@@ -4304,10 +4317,10 @@ module Synth {
     or
     result = convertBuiltinExecutorTypeFromRaw(e)
     or
-    result = convertBuiltinFixedArrayTypeFromRaw(e)
-    or
     result = convertBuiltinFloatTypeFromRaw(e)
     or
+    result = convertBuiltinGenericTypeFromRaw(e)
+    or
     result = convertBuiltinJobTypeFromRaw(e)
     or
     result = convertBuiltinNativeObjectTypeFromRaw(e)
@@ -7037,6 +7050,14 @@ module Synth {
     result = convertBoundGenericStructTypeToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TBuiltinGenericType` to a raw DB element, if possible.
+   */
+  Raw::Element convertBuiltinGenericTypeToRaw(TBuiltinGenericType e) {
+    result = convertBuiltinFixedArrayTypeToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TBuiltinType` to a raw DB element, if possible.
@@ -7050,10 +7071,10 @@ module Synth {
     or
     result = convertBuiltinExecutorTypeToRaw(e)
     or
-    result = convertBuiltinFixedArrayTypeToRaw(e)
-    or
     result = convertBuiltinFloatTypeToRaw(e)
     or
+    result = convertBuiltinGenericTypeToRaw(e)
+    or
     result = convertBuiltinJobTypeToRaw(e)
     or
     result = convertBuiltinNativeObjectTypeToRaw(e)
diff --git a/swift/ql/lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll b/swift/ql/lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll
index b61533168b7..5ed9491607a 100644
--- a/swift/ql/lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll
+++ b/swift/ql/lib/codeql/swift/generated/type/BuiltinFixedArrayType.qll
@@ -6,7 +6,7 @@
 
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
-import codeql.swift.elements.type.internal.BuiltinTypeImpl::Impl as BuiltinTypeImpl
+import codeql.swift.elements.type.internal.BuiltinGenericTypeImpl::Impl as BuiltinGenericTypeImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `BuiltinFixedArrayType` and should not
@@ -18,7 +18,9 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::BuiltinFixedArrayType` class directly.
    * Use the subclass `BuiltinFixedArrayType`, where the following predicates are available.
    */
-  class BuiltinFixedArrayType extends Synth::TBuiltinFixedArrayType, BuiltinTypeImpl::BuiltinType {
+  class BuiltinFixedArrayType extends Synth::TBuiltinFixedArrayType,
+    BuiltinGenericTypeImpl::BuiltinGenericType
+  {
     override string getAPrimaryQlClass() { result = "BuiltinFixedArrayType" }
   }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/type/BuiltinGenericType.qll b/swift/ql/lib/codeql/swift/generated/type/BuiltinGenericType.qll
new file mode 100644
index 00000000000..cfed16ac283
--- /dev/null
+++ b/swift/ql/lib/codeql/swift/generated/type/BuiltinGenericType.qll
@@ -0,0 +1,22 @@
+// generated by codegen/codegen.py, do not edit
+/**
+ * This module provides the generated definition of `BuiltinGenericType`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.swift.generated.Synth
+private import codeql.swift.generated.Raw
+import codeql.swift.elements.type.internal.BuiltinTypeImpl::Impl as BuiltinTypeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `BuiltinGenericType` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A builtin generic type.
+   * INTERNAL: Do not reference the `Generated::BuiltinGenericType` class directly.
+   * Use the subclass `BuiltinGenericType`, where the following predicates are available.
+   */
+  class BuiltinGenericType extends Synth::TBuiltinGenericType, BuiltinTypeImpl::BuiltinType { }
+}
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
index 33e5e5e03bd..ee3053b673c 100644
--- a/swift/ql/lib/swift.dbscheme
+++ b/swift/ql/lib/swift.dbscheme
@@ -2266,8 +2266,8 @@ any_generic_type_parents(  //dir=type
 | @builtin_bridge_object_type
 | @builtin_default_actor_storage_type
 | @builtin_executor_type
-| @builtin_fixed_array_type
 | @builtin_float_type
+| @builtin_generic_type
 | @builtin_job_type
 | @builtin_native_object_type
 | @builtin_raw_pointer_type
@@ -2449,14 +2449,14 @@ builtin_executor_types(  //dir=type
   unique int id: @builtin_executor_type
 );
 
-builtin_fixed_array_types(  //dir=type
-  unique int id: @builtin_fixed_array_type
-);
-
 builtin_float_types(  //dir=type
   unique int id: @builtin_float_type
 );
 
+@builtin_generic_type =
+  @builtin_fixed_array_type
+;
+
 builtin_job_types(  //dir=type
   unique int id: @builtin_job_type
 );
@@ -2558,6 +2558,10 @@ bound_generic_type_arg_types(  //dir=type
   int arg_type: @type_or_none ref
 );
 
+builtin_fixed_array_types(  //dir=type
+  unique int id: @builtin_fixed_array_type
+);
+
 builtin_integer_literal_types(  //dir=type
   unique int id: @builtin_integer_literal_type
 );