diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -5041,298 +5041,8 @@
       break;
 
     // RISC-V V builtin types.
-    case clang::BuiltinType::RvvInt8mf8:
-    case clang::BuiltinType::RvvInt8mf4:
-    case clang::BuiltinType::RvvInt8mf2:
-    case clang::BuiltinType::RvvInt8m1:
-    case clang::BuiltinType::RvvInt8m2:
-    case clang::BuiltinType::RvvInt8m4:
-    case clang::BuiltinType::RvvInt8m8:
-    case clang::BuiltinType::RvvUint8mf8:
-    case clang::BuiltinType::RvvUint8mf4:
-    case clang::BuiltinType::RvvUint8mf2:
-    case clang::BuiltinType::RvvUint8m1:
-    case clang::BuiltinType::RvvUint8m2:
-    case clang::BuiltinType::RvvUint8m4:
-    case clang::BuiltinType::RvvUint8m8:
-    case clang::BuiltinType::RvvInt16mf4:
-    case clang::BuiltinType::RvvInt16mf2:
-    case clang::BuiltinType::RvvInt16m1:
-    case clang::BuiltinType::RvvInt16m2:
-    case clang::BuiltinType::RvvInt16m4:
-    case clang::BuiltinType::RvvInt16m8:
-    case clang::BuiltinType::RvvUint16mf4:
-    case clang::BuiltinType::RvvUint16mf2:
-    case clang::BuiltinType::RvvUint16m1:
-    case clang::BuiltinType::RvvUint16m2:
-    case clang::BuiltinType::RvvUint16m4:
-    case clang::BuiltinType::RvvUint16m8:
-    case clang::BuiltinType::RvvInt32mf2:
-    case clang::BuiltinType::RvvInt32m1:
-    case clang::BuiltinType::RvvInt32m2:
-    case clang::BuiltinType::RvvInt32m4:
-    case clang::BuiltinType::RvvInt32m8:
-    case clang::BuiltinType::RvvUint32mf2:
-    case clang::BuiltinType::RvvUint32m1:
-    case clang::BuiltinType::RvvUint32m2:
-    case clang::BuiltinType::RvvUint32m4:
-    case clang::BuiltinType::RvvUint32m8:
-    case clang::BuiltinType::RvvInt64m1:
-    case clang::BuiltinType::RvvInt64m2:
-    case clang::BuiltinType::RvvInt64m4:
-    case clang::BuiltinType::RvvInt64m8:
-    case clang::BuiltinType::RvvUint64m1:
-    case clang::BuiltinType::RvvUint64m2:
-    case clang::BuiltinType::RvvUint64m4:
-    case clang::BuiltinType::RvvUint64m8:
-    case clang::BuiltinType::RvvFloat16mf4:
-    case clang::BuiltinType::RvvFloat16mf2:
-    case clang::BuiltinType::RvvFloat16m1:
-    case clang::BuiltinType::RvvFloat16m2:
-    case clang::BuiltinType::RvvFloat16m4:
-    case clang::BuiltinType::RvvFloat16m8:
-    case clang::BuiltinType::RvvFloat32mf2:
-    case clang::BuiltinType::RvvFloat32m1:
-    case clang::BuiltinType::RvvFloat32m2:
-    case clang::BuiltinType::RvvFloat32m4:
-    case clang::BuiltinType::RvvFloat32m8:
-    case clang::BuiltinType::RvvFloat64m1:
-    case clang::BuiltinType::RvvFloat64m2:
-    case clang::BuiltinType::RvvFloat64m4:
-    case clang::BuiltinType::RvvFloat64m8:
-    case clang::BuiltinType::RvvBool1:
-    case clang::BuiltinType::RvvBool2:
-    case clang::BuiltinType::RvvBool4:
-    case clang::BuiltinType::RvvBool8:
-    case clang::BuiltinType::RvvBool16:
-    case clang::BuiltinType::RvvBool32:
-    case clang::BuiltinType::RvvBool64:
-    case clang::BuiltinType::RvvInt8mf8x2:
-    case clang::BuiltinType::RvvInt8mf8x3:
-    case clang::BuiltinType::RvvInt8mf8x4:
-    case clang::BuiltinType::RvvInt8mf8x5:
-    case clang::BuiltinType::RvvInt8mf8x6:
-    case clang::BuiltinType::RvvInt8mf8x7:
-    case clang::BuiltinType::RvvInt8mf8x8:
-    case clang::BuiltinType::RvvInt8mf4x2:
-    case clang::BuiltinType::RvvInt8mf4x3:
-    case clang::BuiltinType::RvvInt8mf4x4:
-    case clang::BuiltinType::RvvInt8mf4x5:
-    case clang::BuiltinType::RvvInt8mf4x6:
-    case clang::BuiltinType::RvvInt8mf4x7:
-    case clang::BuiltinType::RvvInt8mf4x8:
-    case clang::BuiltinType::RvvInt8mf2x2:
-    case clang::BuiltinType::RvvInt8mf2x3:
-    case clang::BuiltinType::RvvInt8mf2x4:
-    case clang::BuiltinType::RvvInt8mf2x5:
-    case clang::BuiltinType::RvvInt8mf2x6:
-    case clang::BuiltinType::RvvInt8mf2x7:
-    case clang::BuiltinType::RvvInt8mf2x8:
-    case clang::BuiltinType::RvvInt8m1x2:
-    case clang::BuiltinType::RvvInt8m1x3:
-    case clang::BuiltinType::RvvInt8m1x4:
-    case clang::BuiltinType::RvvInt8m1x5:
-    case clang::BuiltinType::RvvInt8m1x6:
-    case clang::BuiltinType::RvvInt8m1x7:
-    case clang::BuiltinType::RvvInt8m1x8:
-    case clang::BuiltinType::RvvInt8m2x2:
-    case clang::BuiltinType::RvvInt8m2x3:
-    case clang::BuiltinType::RvvInt8m2x4:
-    case clang::BuiltinType::RvvInt8m4x2:
-    case clang::BuiltinType::RvvUint8mf8x2:
-    case clang::BuiltinType::RvvUint8mf8x3:
-    case clang::BuiltinType::RvvUint8mf8x4:
-    case clang::BuiltinType::RvvUint8mf8x5:
-    case clang::BuiltinType::RvvUint8mf8x6:
-    case clang::BuiltinType::RvvUint8mf8x7:
-    case clang::BuiltinType::RvvUint8mf8x8:
-    case clang::BuiltinType::RvvUint8mf4x2:
-    case clang::BuiltinType::RvvUint8mf4x3:
-    case clang::BuiltinType::RvvUint8mf4x4:
-    case clang::BuiltinType::RvvUint8mf4x5:
-    case clang::BuiltinType::RvvUint8mf4x6:
-    case clang::BuiltinType::RvvUint8mf4x7:
-    case clang::BuiltinType::RvvUint8mf4x8:
-    case clang::BuiltinType::RvvUint8mf2x2:
-    case clang::BuiltinType::RvvUint8mf2x3:
-    case clang::BuiltinType::RvvUint8mf2x4:
-    case clang::BuiltinType::RvvUint8mf2x5:
-    case clang::BuiltinType::RvvUint8mf2x6:
-    case clang::BuiltinType::RvvUint8mf2x7:
-    case clang::BuiltinType::RvvUint8mf2x8:
-    case clang::BuiltinType::RvvUint8m1x2:
-    case clang::BuiltinType::RvvUint8m1x3:
-    case clang::BuiltinType::RvvUint8m1x4:
-    case clang::BuiltinType::RvvUint8m1x5:
-    case clang::BuiltinType::RvvUint8m1x6:
-    case clang::BuiltinType::RvvUint8m1x7:
-    case clang::BuiltinType::RvvUint8m1x8:
-    case clang::BuiltinType::RvvUint8m2x2:
-    case clang::BuiltinType::RvvUint8m2x3:
-    case clang::BuiltinType::RvvUint8m2x4:
-    case clang::BuiltinType::RvvUint8m4x2:
-    case clang::BuiltinType::RvvInt16mf4x2:
-    case clang::BuiltinType::RvvInt16mf4x3:
-    case clang::BuiltinType::RvvInt16mf4x4:
-    case clang::BuiltinType::RvvInt16mf4x5:
-    case clang::BuiltinType::RvvInt16mf4x6:
-    case clang::BuiltinType::RvvInt16mf4x7:
-    case clang::BuiltinType::RvvInt16mf4x8:
-    case clang::BuiltinType::RvvInt16mf2x2:
-    case clang::BuiltinType::RvvInt16mf2x3:
-    case clang::BuiltinType::RvvInt16mf2x4:
-    case clang::BuiltinType::RvvInt16mf2x5:
-    case clang::BuiltinType::RvvInt16mf2x6:
-    case clang::BuiltinType::RvvInt16mf2x7:
-    case clang::BuiltinType::RvvInt16mf2x8:
-    case clang::BuiltinType::RvvInt16m1x2:
-    case clang::BuiltinType::RvvInt16m1x3:
-    case clang::BuiltinType::RvvInt16m1x4:
-    case clang::BuiltinType::RvvInt16m1x5:
-    case clang::BuiltinType::RvvInt16m1x6:
-    case clang::BuiltinType::RvvInt16m1x7:
-    case clang::BuiltinType::RvvInt16m1x8:
-    case clang::BuiltinType::RvvInt16m2x2:
-    case clang::BuiltinType::RvvInt16m2x3:
-    case clang::BuiltinType::RvvInt16m2x4:
-    case clang::BuiltinType::RvvInt16m4x2:
-    case clang::BuiltinType::RvvUint16mf4x2:
-    case clang::BuiltinType::RvvUint16mf4x3:
-    case clang::BuiltinType::RvvUint16mf4x4:
-    case clang::BuiltinType::RvvUint16mf4x5:
-    case clang::BuiltinType::RvvUint16mf4x6:
-    case clang::BuiltinType::RvvUint16mf4x7:
-    case clang::BuiltinType::RvvUint16mf4x8:
-    case clang::BuiltinType::RvvUint16mf2x2:
-    case clang::BuiltinType::RvvUint16mf2x3:
-    case clang::BuiltinType::RvvUint16mf2x4:
-    case clang::BuiltinType::RvvUint16mf2x5:
-    case clang::BuiltinType::RvvUint16mf2x6:
-    case clang::BuiltinType::RvvUint16mf2x7:
-    case clang::BuiltinType::RvvUint16mf2x8:
-    case clang::BuiltinType::RvvUint16m1x2:
-    case clang::BuiltinType::RvvUint16m1x3:
-    case clang::BuiltinType::RvvUint16m1x4:
-    case clang::BuiltinType::RvvUint16m1x5:
-    case clang::BuiltinType::RvvUint16m1x6:
-    case clang::BuiltinType::RvvUint16m1x7:
-    case clang::BuiltinType::RvvUint16m1x8:
-    case clang::BuiltinType::RvvUint16m2x2:
-    case clang::BuiltinType::RvvUint16m2x3:
-    case clang::BuiltinType::RvvUint16m2x4:
-    case clang::BuiltinType::RvvUint16m4x2:
-    case clang::BuiltinType::RvvInt32mf2x2:
-    case clang::BuiltinType::RvvInt32mf2x3:
-    case clang::BuiltinType::RvvInt32mf2x4:
-    case clang::BuiltinType::RvvInt32mf2x5:
-    case clang::BuiltinType::RvvInt32mf2x6:
-    case clang::BuiltinType::RvvInt32mf2x7:
-    case clang::BuiltinType::RvvInt32mf2x8:
-    case clang::BuiltinType::RvvInt32m1x2:
-    case clang::BuiltinType::RvvInt32m1x3:
-    case clang::BuiltinType::RvvInt32m1x4:
-    case clang::BuiltinType::RvvInt32m1x5:
-    case clang::BuiltinType::RvvInt32m1x6:
-    case clang::BuiltinType::RvvInt32m1x7:
-    case clang::BuiltinType::RvvInt32m1x8:
-    case clang::BuiltinType::RvvInt32m2x2:
-    case clang::BuiltinType::RvvInt32m2x3:
-    case clang::BuiltinType::RvvInt32m2x4:
-    case clang::BuiltinType::RvvInt32m4x2:
-    case clang::BuiltinType::RvvUint32mf2x2:
-    case clang::BuiltinType::RvvUint32mf2x3:
-    case clang::BuiltinType::RvvUint32mf2x4:
-    case clang::BuiltinType::RvvUint32mf2x5:
-    case clang::BuiltinType::RvvUint32mf2x6:
-    case clang::BuiltinType::RvvUint32mf2x7:
-    case clang::BuiltinType::RvvUint32mf2x8:
-    case clang::BuiltinType::RvvUint32m1x2:
-    case clang::BuiltinType::RvvUint32m1x3:
-    case clang::BuiltinType::RvvUint32m1x4:
-    case clang::BuiltinType::RvvUint32m1x5:
-    case clang::BuiltinType::RvvUint32m1x6:
-    case clang::BuiltinType::RvvUint32m1x7:
-    case clang::BuiltinType::RvvUint32m1x8:
-    case clang::BuiltinType::RvvUint32m2x2:
-    case clang::BuiltinType::RvvUint32m2x3:
-    case clang::BuiltinType::RvvUint32m2x4:
-    case clang::BuiltinType::RvvUint32m4x2:
-    case clang::BuiltinType::RvvInt64m1x2:
-    case clang::BuiltinType::RvvInt64m1x3:
-    case clang::BuiltinType::RvvInt64m1x4:
-    case clang::BuiltinType::RvvInt64m1x5:
-    case clang::BuiltinType::RvvInt64m1x6:
-    case clang::BuiltinType::RvvInt64m1x7:
-    case clang::BuiltinType::RvvInt64m1x8:
-    case clang::BuiltinType::RvvInt64m2x2:
-    case clang::BuiltinType::RvvInt64m2x3:
-    case clang::BuiltinType::RvvInt64m2x4:
-    case clang::BuiltinType::RvvInt64m4x2:
-    case clang::BuiltinType::RvvUint64m1x2:
-    case clang::BuiltinType::RvvUint64m1x3:
-    case clang::BuiltinType::RvvUint64m1x4:
-    case clang::BuiltinType::RvvUint64m1x5:
-    case clang::BuiltinType::RvvUint64m1x6:
-    case clang::BuiltinType::RvvUint64m1x7:
-    case clang::BuiltinType::RvvUint64m1x8:
-    case clang::BuiltinType::RvvUint64m2x2:
-    case clang::BuiltinType::RvvUint64m2x3:
-    case clang::BuiltinType::RvvUint64m2x4:
-    case clang::BuiltinType::RvvUint64m4x2:
-    case clang::BuiltinType::RvvFloat16mf4x2:
-    case clang::BuiltinType::RvvFloat16mf4x3:
-    case clang::BuiltinType::RvvFloat16mf4x4:
-    case clang::BuiltinType::RvvFloat16mf4x5:
-    case clang::BuiltinType::RvvFloat16mf4x6:
-    case clang::BuiltinType::RvvFloat16mf4x7:
-    case clang::BuiltinType::RvvFloat16mf4x8:
-    case clang::BuiltinType::RvvFloat16mf2x2:
-    case clang::BuiltinType::RvvFloat16mf2x3:
-    case clang::BuiltinType::RvvFloat16mf2x4:
-    case clang::BuiltinType::RvvFloat16mf2x5:
-    case clang::BuiltinType::RvvFloat16mf2x6:
-    case clang::BuiltinType::RvvFloat16mf2x7:
-    case clang::BuiltinType::RvvFloat16mf2x8:
-    case clang::BuiltinType::RvvFloat16m1x2:
-    case clang::BuiltinType::RvvFloat16m1x3:
-    case clang::BuiltinType::RvvFloat16m1x4:
-    case clang::BuiltinType::RvvFloat16m1x5:
-    case clang::BuiltinType::RvvFloat16m1x6:
-    case clang::BuiltinType::RvvFloat16m1x7:
-    case clang::BuiltinType::RvvFloat16m1x8:
-    case clang::BuiltinType::RvvFloat16m2x2:
-    case clang::BuiltinType::RvvFloat16m2x3:
-    case clang::BuiltinType::RvvFloat16m2x4:
-    case clang::BuiltinType::RvvFloat16m4x2:
-    case clang::BuiltinType::RvvFloat32mf2x2:
-    case clang::BuiltinType::RvvFloat32mf2x3:
-    case clang::BuiltinType::RvvFloat32mf2x4:
-    case clang::BuiltinType::RvvFloat32mf2x5:
-    case clang::BuiltinType::RvvFloat32mf2x6:
-    case clang::BuiltinType::RvvFloat32mf2x7:
-    case clang::BuiltinType::RvvFloat32mf2x8:
-    case clang::BuiltinType::RvvFloat32m1x2:
-    case clang::BuiltinType::RvvFloat32m1x3:
-    case clang::BuiltinType::RvvFloat32m1x4:
-    case clang::BuiltinType::RvvFloat32m1x5:
-    case clang::BuiltinType::RvvFloat32m1x6:
-    case clang::BuiltinType::RvvFloat32m1x7:
-    case clang::BuiltinType::RvvFloat32m1x8:
-    case clang::BuiltinType::RvvFloat32m2x2:
-    case clang::BuiltinType::RvvFloat32m2x3:
-    case clang::BuiltinType::RvvFloat32m2x4:
-    case clang::BuiltinType::RvvFloat32m4x2:
-    case clang::BuiltinType::RvvFloat64m1x2:
-    case clang::BuiltinType::RvvFloat64m1x3:
-    case clang::BuiltinType::RvvFloat64m1x4:
-    case clang::BuiltinType::RvvFloat64m1x5:
-    case clang::BuiltinType::RvvFloat64m1x6:
-    case clang::BuiltinType::RvvFloat64m1x7:
-    case clang::BuiltinType::RvvFloat64m1x8:
-    case clang::BuiltinType::RvvFloat64m2x2:
-    case clang::BuiltinType::RvvFloat64m2x3:
-    case clang::BuiltinType::RvvFloat64m2x4:
-    case clang::BuiltinType::RvvFloat64m4x2:
+#define RVV_TYPE(Name, Id, SingletonId) case clang::BuiltinType::Id:
+#include "clang/Basic/RISCVVTypes.def"
       break;
 
     // WebAssembly builtin types.