From 8b016c4fc2d6b5584e451c98333f2fd8dc229d2c Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Thu, 21 Aug 2025 15:26:41 +0800
Subject: [PATCH] [CHERIoT] Use a target feature test rather than subarch test
 for CHERIoT in the static analyzer.

---
 .../Checkers/CHERI/SubObjectRepresentabilityChecker.cpp        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/clang/lib/StaticAnalyzer/Checkers/CHERI/SubObjectRepresentabilityChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/CHERI/SubObjectRepresentabilityChecker.cpp
index e8b47960ab8b9..0c338fea9f456 100644
--- a/clang/lib/StaticAnalyzer/Checkers/CHERI/SubObjectRepresentabilityChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/CHERI/SubObjectRepresentabilityChecker.cpp
@@ -163,8 +163,7 @@ SubObjectRepresentabilityChecker::getCheckFieldFn(ASTContext &ASTCtx) const {
     return nullptr;
 
   const auto &T = TI.getTriple();
-  if (T.getArch() == llvm::Triple::riscv32 &&
-      T.getSubArch() == llvm::Triple::RISCV32SubArch_cheriot_v1) {
+  if (T.getArch() == llvm::Triple::riscv32 && TI.hasFeature("xcheriot")) {
     return &checkFieldImpl<llvm::CompressedCapability::Cheriot64>;
   }