[CHERIoT] Make XCheriot imply the other features it depends on.

Author: resistor

llvm/lib/Target/RISCV/RISCVFeatures.td

@@ -1384,7 +1384,9 @@ def NotPureCapABI
     : Predicate<"!RISCVABI::isCheriPureCapABI(Subtarget->getTargetABI())">;
 
 def FeatureVendorXCheriot
-    : RISCVExtension<1, 0, "Implements XCheriot extension">;
+    : RISCVExtension<1, 0, "Implements XCheriot extension",
+    [FeatureVendorXCheri, FeatureVendorXCheriPureCap, 
+     FeatureStdExtC, FeatureStdExtE, FeatureStdExtM]>;
 
 def HasCheriot
     : Predicate<"Subtarget->hasVendorXCheriot()">,

llvm/lib/TargetParser/RISCVISAInfo.cpp

@@ -802,19 +802,6 @@ static bool operator<(StringRef LHS, const ImpliedExtsEntry &RHS) {
 #include "llvm/TargetParser/RISCVTargetParserDef.inc"
 
 void RISCVISAInfo::updateImplication() {
-  bool HasE = Exts.count("e") != 0;
-  bool HasI = Exts.count("i") != 0;
-
-  // If not in e extension and i extension does not exist, i extension is
-  // implied
-  if (!HasE && !HasI) {
-    auto Version = findDefaultVersion("i");
-    Exts["i"] = *Version;
-  }
-
-  if (HasE && HasI)
-    Exts.erase("i");
-
   assert(llvm::is_sorted(ImpliedExts) && "Table not sorted by Name");
 
   // This loop may execute over 1 iteration since implication can be layered
@@ -844,6 +831,19 @@ void RISCVISAInfo::updateImplication() {
     auto Version = findDefaultVersion("zcf");
     Exts["zcf"] = *Version;
   }
+
+  bool HasE = Exts.count("e") != 0;
+  bool HasI = Exts.count("i") != 0;
+
+  // If not in e extension and i extension does not exist, i extension is
+  // implied
+  if (!HasE && !HasI) {
+    auto Version = findDefaultVersion("i");
+    Exts["i"] = *Version;
+  }
+
+  if (HasE && HasI)
+    Exts.erase("i");
 }
 
 static constexpr StringLiteral CombineIntoExts[] = {