@@ -398,6 +398,8 @@ private predicate isIntegralType(@builtintype type, int kind) {
     kind = 44
     or
     kind = 51
+    or
+    67 <= kind and kind <= 69
   )
 }
 
@@ -484,6 +486,12 @@ private predicate integralTypeMapping(int original, int canonical, int unsigned,
   original = 44 and canonical = 44 and unsigned = -1 and signed = -1 // char32_t
   or
   original = 51 and canonical = 51 and unsigned = -1 and signed = -1 // char8_t
+  or
+  original = 67 and canonical = 67 and unsigned = 68 and signed = 69 // _BitInt(N)
+  or
+  original = 68 and canonical = 68 and unsigned = 68 and signed = 69 // unsigned _BitInt(N)
+  or
+  original = 69 and canonical = 67 and unsigned = 68 and signed = 69 // signed _BitInt(N)
 }
 
 /**
@@ -517,7 +525,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 13, _, _, _) or
     builtintypes(underlyingElement(this), _, 16, _, _, _) or
     builtintypes(underlyingElement(this), _, 19, _, _, _) or
-    builtintypes(underlyingElement(this), _, 37, _, _, _)
+    builtintypes(underlyingElement(this), _, 37, _, _, _) or
+    builtintypes(underlyingElement(this), _, 69, _, _, _)
   }
 
   /** Holds if this integral type is explicitly unsigned. */
@@ -527,7 +536,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 12, _, _, _) or
     builtintypes(underlyingElement(this), _, 15, _, _, _) or
     builtintypes(underlyingElement(this), _, 18, _, _, _) or
-    builtintypes(underlyingElement(this), _, 36, _, _, _)
+    builtintypes(underlyingElement(this), _, 36, _, _, _) or
+    builtintypes(underlyingElement(this), _, 68, _, _, _)
   }
 
   /** Holds if this integral type is implicitly signed. */
@@ -537,7 +547,8 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
     builtintypes(underlyingElement(this), _, 11, _, -1, _) or
     builtintypes(underlyingElement(this), _, 14, _, -1, _) or
     builtintypes(underlyingElement(this), _, 17, _, -1, _) or
-    builtintypes(underlyingElement(this), _, 35, _, -1, _)
+    builtintypes(underlyingElement(this), _, 35, _, -1, _) or
+    builtintypes(underlyingElement(this), _, 67, _, -1, _)
   }
 
   /**
@@ -547,7 +558,14 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
   IntegralType getUnsigned() {
     exists(int unsignedKind |
       integralTypeMapping(kind, _, unsignedKind, _) and
-      builtintypes(unresolveElement(result), _, unsignedKind, _, _, _)
+      builtintypes(unresolveElement(result), _, unsignedKind, _, _, _) and
+      (
+        not kind in [67, 68, 69]
+        or
+        exists(int bitWidth | bit_precise_int_types(underlyingElement(this), bitWidth) |
+          bit_precise_int_types(unresolveElement(result), bitWidth)
+        )
+      )
     )
   }
 
@@ -562,7 +580,14 @@ class IntegralType extends ArithmeticType, IntegralOrEnumType {
   IntegralType getCanonicalArithmeticType() {
     exists(int canonicalKind |
       integralTypeMapping(kind, canonicalKind, _, _) and
-      builtintypes(unresolveElement(result), _, canonicalKind, _, _, _)
+      builtintypes(unresolveElement(result), _, canonicalKind, _, _, _) and
+      (
+        not kind in [67, 68, 69]
+        or
+        exists(int bitWidth | bit_precise_int_types(underlyingElement(this), bitWidth) |
+          bit_precise_int_types(unresolveElement(result), bitWidth)
+        )
+      )
     )
   }
 }
@@ -1045,6 +1070,18 @@ class Char32Type extends IntegralType {
   override string getAPrimaryQlClass() { result = "Char32Type" }
 }
 
+/**
+ * A C23 bit-precise integer type `_BitInt(N)`.
+ */
+class BitPreciseIntType extends IntegralType {
+  BitPreciseIntType() { builtintypes(underlyingElement(this), _, [67, 68, 69], _, _, _) }
+
+  /** Get the bit-with of the bit-precise integer. */
+  int getBitWidth() { bit_precise_int_types(underlyingElement(this), result) }
+
+  override string getAPrimaryQlClass() { result = "BitPreciseIntType" }
+}
+
 /**
  * The (primitive) type of the C++11 `nullptr` constant.  It is a
  * distinct type, denoted by `decltype(nullptr)`, that is not itself a pointer
 
@@ -660,46 +660,49 @@ case @builtintype.kind of
 | 24 = @float
 | 25 = @double
 | 26 = @long_double
-| 27 = @complex_float         // C99-specific _Complex float
-| 28 = @complex_double        // C99-specific _Complex double
-| 29 = @complex_long_double   // C99-specific _Complex long double
-| 30 = @imaginary_float       // C99-specific _Imaginary float
-| 31 = @imaginary_double      // C99-specific _Imaginary double
-| 32 = @imaginary_long_double // C99-specific _Imaginary long double
-| 33 = @wchar_t               // Microsoft-specific
-| 34 = @decltype_nullptr      // C++11
-| 35 = @int128                // __int128
-| 36 = @unsigned_int128       // unsigned __int128
-| 37 = @signed_int128         // signed __int128
-| 38 = @float128              // __float128
-| 39 = @complex_float128      // _Complex __float128
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
 // ... 40 _Decimal32
 // ... 41 _Decimal64
 // ... 42 _Decimal128
 | 43 = @char16_t
 | 44 = @char32_t
-| 45 = @std_float32           // _Float32
-| 46 = @float32x              // _Float32x
-| 47 = @std_float64           // _Float64
-| 48 = @float64x              // _Float64x
-| 49 = @std_float128          // _Float128
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
 // ... 50 _Float128x
 | 51 = @char8_t
-| 52 = @float16               // _Float16
-| 53 = @complex_float16       // _Complex _Float16
-| 54 = @fp16                  // __fp16
-| 55 = @std_bfloat16          // __bf16
-| 56 = @std_float16           // std::float16_t
-| 57 = @complex_std_float32   // _Complex _Float32
-| 58 = @complex_float32x      // _Complex _Float32x
-| 59 = @complex_std_float64   // _Complex _Float64
-| 60 = @complex_float64x      // _Complex _Float64x
-| 61 = @complex_std_float128  // _Complex _Float128
-| 62 = @mfp8                  // __mfp8
-| 63 = @scalable_vector_count // __SVCount_t
-| 64 = @complex_fp16          // _Complex __fp16
-| 65 = @complex_std_bfloat16  // _Complex __bf16
-| 66 = @complex_std_float16   // _Complex std::float16_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
 ;
 
 builtintypes(
@@ -711,6 +714,11 @@ builtintypes(
     int alignment: int ref
 );
 
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
 /**
  * Derived types are types that are directly derived from existing types and
  * point to, refer to, transform type data to return a new type.
@@ -736,9 +744,11 @@ derivedtypes(
     int type_id: @type ref
 );
 
-pointerishsize(unique int id: @derivedtype ref,
+pointerishsize(
+    unique int id: @derivedtype ref,
     int size: int ref,
-    int alignment: int ref);
+    int alignment: int ref
+);
 
 arraysizes(
     unique int id: @derivedtype ref,