[CHERI] Disable GlobalMerge for for RISCV whenever CHERI is enabled in any form.

Author: resistor

llvm/include/llvm/Target/TargetMachine.h

@@ -203,6 +203,10 @@ class TargetMachine {
     return DL.getPointerSize(DL.getAllocaAddrSpace());
   }
 
+  bool hasCheriCapabilities() const {
+    return DL.hasCheriCapabilities();
+  }
+
   /// Reset the target options based on the function's attributes.
   // FIXME: Remove TargetOptions that affect per-function code generation
   // from TargetMachine.

llvm/lib/Target/RISCV/RISCVTargetMachine.cpp

@@ -510,9 +510,9 @@ bool RISCVPassConfig::addPreISel() {
     addPass(createBarrierNoopPass());
   }
 
-  bool isCheriot =
-      TM->getTargetTriple().getSubArch() == Triple::RISCV32SubArch_cheriot_v1;
-  if ((TM->getOptLevel() != CodeGenOptLevel::None && !isCheriot &&
+  // XXX: GlobalMerge is undesirable on CHERI, as it makes the bounds on globals
+  // excessively loose.
+  if ((TM->getOptLevel() != CodeGenOptLevel::None && !TM->hasCheriCapabilities() &&
        EnableGlobalMerge == cl::BOU_UNSET) ||
       EnableGlobalMerge == cl::BOU_TRUE) {
     // FIXME: Like AArch64, we disable extern global merging by default due to