[NFCI][CodeGen][MC][Mips][RISCV] Follow emitValue for EmitCheriCapability

Rename the underlying function to emitCheriCapability, and have the
symbol-only version be non-virtual and called emitSymbolCheriCapability
like emitSymbolValue.

Drop the addend overloads and let the callers create the adds. Not many
callers exist, no equivalent exists for integers, and two of the three
uses will be changed in a future commit anyway.

Author: jrtc27

llvm/include/llvm/MC/MCStreamer.h

@@ -836,14 +836,12 @@ class MCStreamer {
   // MCAsmInfo only knowns about the triple which is not enough
 
   // Emit the expression \p Value into the output as a CHERI capability
-  virtual void EmitCheriCapability(const MCExpr *Value, unsigned CapSize,
+  virtual void emitCheriCapability(const MCExpr *Value, unsigned CapSize,
                                    SMLoc Loc = SMLoc());
-  void EmitCheriCapability(const MCSymbol *Value, const MCExpr *Addend,
-                           unsigned CapSize, SMLoc Loc = SMLoc());
-  void EmitCheriCapability(const MCSymbol *Value, int64_t Addend,
-                           unsigned CapSize, SMLoc Loc = SMLoc());
-  void EmitCheriCapability(const MCSymbol *Value, unsigned CapSize,
-                           SMLoc Loc = SMLoc());
+
+  /// Special case of emitCheriCapability that avoids the client having to pass
+  /// in a MCExpr for MCSymbols.
+  void emitSymbolCheriCapability(const MCSymbol *Sym, unsigned CapSize);
 
   // Emit \p Value as an untagged capability-size value
   virtual void emitCheriIntcap(int64_t Value, unsigned CapSize,

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -2312,7 +2312,8 @@ bool AsmPrinter::doFinalization(Module &M) {
       for (const auto &Stub : Stubs) {
         OutStreamer->emitLabel(Stub.first);
         if (DL.isFatPointer(AS))
-          OutStreamer->EmitCheriCapability(Stub.second.getPointer(), Size);
+          OutStreamer->emitSymbolCheriCapability(Stub.second.getPointer(),
+                                                 Size);
         else
           OutStreamer->emitSymbolValue(Stub.second.getPointer(), Size);
       }
@@ -3654,20 +3655,26 @@ static void emitGlobalConstantCHERICap(const DataLayout &DL, const Constant *CV,
     return;
   }
   GlobalValue *GV;
-  APInt Addend;
-  if (IsConstantOffsetFromGlobal(const_cast<Constant *>(CV), GV, Addend, DL,
+  APInt Offset;
+  MCContext &Ctx = AP.OutContext;
+  if (IsConstantOffsetFromGlobal(const_cast<Constant *>(CV), GV, Offset, DL,
                                  true)) {
-    AP.OutStreamer->EmitCheriCapability(AP.getSymbol(GV), Addend.getSExtValue(),
-                                        CapWidth);
+    const MCExpr *CapExpr = MCSymbolRefExpr::create(AP.getSymbol(GV), Ctx);
+    int64_t Addend = Offset.getSExtValue();
+    if (Addend != 0)
+      CapExpr = MCBinaryExpr::createAdd(
+          CapExpr, MCConstantExpr::create(Addend, Ctx), Ctx);
+    AP.OutStreamer->emitCheriCapability(CapExpr, CapWidth);
     return;
   } else if (const MCSymbolRefExpr *SRE = dyn_cast<MCSymbolRefExpr>(Expr)) {
     if (auto BA = dyn_cast<BlockAddress>(CV)) {
       // For block addresses we emit `.chericap FN+(.LtmpN - FN)`
       // NB: Must use a non-preemptible symbol
       auto FnStart = AP.getSymbolPreferLocal(*BA->getFunction(), true);
-      const MCExpr *DiffToStart = MCBinaryExpr::createSub(
-          SRE, MCSymbolRefExpr::create(FnStart, AP.OutContext), AP.OutContext);
-      AP.OutStreamer->EmitCheriCapability(FnStart, DiffToStart, CapWidth);
+      const MCExpr *Start = MCSymbolRefExpr::create(FnStart, Ctx);
+      const MCExpr *DiffToStart = MCBinaryExpr::createSub(SRE, Start, Ctx);
+      const MCExpr *CapExpr = MCBinaryExpr::createAdd(Start, DiffToStart, Ctx);
+      AP.OutStreamer->emitCheriCapability(CapExpr, CapWidth);
       return;
     }
     // Emit capability for label whose address is stored in a global variable
@@ -3676,7 +3683,7 @@ static void emitGlobalConstantCHERICap(const DataLayout &DL, const Constant *CV,
       report_fatal_error(
           "Cannot emit a global .chericap referring to a temporary since this "
           "will result in the wrong value at runtime!");
-      AP.OutStreamer->EmitCheriCapability(&SRE->getSymbol(), CapWidth);
+      AP.OutStreamer->emitSymbolCheriCapability(&SRE->getSymbol(), CapWidth);
       return;
     }
   }

llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp

@@ -203,20 +203,23 @@ void AsmPrinter::emitCallSiteValue(uint64_t Value, unsigned Encoding) const {
 
 void AsmPrinter::emitCallSiteCheriCapability(const MCSymbol *Hi,
                                              const MCSymbol *Lo) const {
+  assert(CurrentFnBeginLocal && "Missing local function entry alias for EH!");
+
   const TargetLoweringObjectFile &TLOF = getObjFileLowering();
+
   // Get the Hi-Lo expression. We use (and need) Lo since the offset needs to
   // be a constant expression, whereas CurrentFnSym is preemptible.
   const MCExpr *DiffToStart = MCBinaryExpr::createSub(
       MCSymbolRefExpr::create(Hi, OutContext),
       MCSymbolRefExpr::create(Lo, OutContext),
       OutContext);
   // Note: we cannot use Lo here since that is an assembler-local symbol and
-  // this would result in EmitCheriCapability() creating a relocation against
+  // this would result in emitCheriCapability() creating a relocation against
   // section plus offset rather than function + offset. We need the right
   // bounds and permissions info and need to use a non-preemptible alias.
-  assert(CurrentFnBeginLocal && "Missing local function entry alias for EH!");
-  OutStreamer->EmitCheriCapability(CurrentFnBeginLocal, DiffToStart,
-                                   TLOF.getCheriCapabilitySize(TM));
+  const MCExpr *Expr = MCSymbolRefExpr::create(CurrentFnBeginLocal, OutContext);
+  Expr = MCBinaryExpr::createAdd(Expr, DiffToStart, OutContext);
+  OutStreamer->emitCheriCapability(Expr, TLOF.getCheriCapabilitySize(TM));
 }
 
 //===----------------------------------------------------------------------===//

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

@@ -434,7 +434,7 @@ void TargetLoweringObjectFileELF::emitPersonalityValue(
   Streamer.emitLabel(Label);
 
   if (DL.isFatPointer(AS)) {
-    Streamer.EmitCheriCapability(Sym, Size);
+    Streamer.emitSymbolCheriCapability(Sym, Size);
   } else {
     Streamer.emitSymbolValue(Sym, Size);
   }

llvm/lib/MC/MCAsmStreamer.cpp

@@ -390,7 +390,7 @@ class MCAsmStreamer final : public MCStreamer {
   void emitBundleLock(bool AlignToEnd) override;
   void emitBundleUnlock() override;
 
-  void EmitCheriCapability(const MCExpr *Value, unsigned CapSize,
+  void emitCheriCapability(const MCExpr *Value, unsigned CapSize,
                            SMLoc Loc = SMLoc()) override;
   void emitCheriIntcap(const MCExpr *Expr, unsigned CapSize,
                        SMLoc Loc = SMLoc()) override;
@@ -2483,7 +2483,7 @@ void MCAsmStreamer::emitBundleUnlock() {
   EmitEOL();
 }
 
-void MCAsmStreamer::EmitCheriCapability(const MCExpr *Value, unsigned CapSize,
+void MCAsmStreamer::emitCheriCapability(const MCExpr *Value, unsigned CapSize,
                                         SMLoc Loc) {
   OS << "\t.chericap\t";
   if (MCTargetStreamer *TS = getTargetStreamer()) {

llvm/lib/MC/MCParser/AsmParser.cpp

@@ -5890,7 +5890,7 @@ bool AsmParser::parseDirectiveCheriCap(SMLoc DirectiveLoc) {
   if (Expr->evaluateAsAbsolute(Value, getStreamer().getAssemblerPtr()))
     getStreamer().emitCheriIntcap(Value, CapSize, ExprLoc);
   else
-    getStreamer().EmitCheriCapability(Expr, CapSize, ExprLoc);
+    getStreamer().emitCheriCapability(Expr, CapSize, ExprLoc);
 
   if (parseToken(AsmToken::EndOfStatement, "expected end of statement"))
     return true;

llvm/lib/MC/MCStreamer.cpp

@@ -220,29 +220,15 @@ void MCStreamer::emitGPRel32Value(const MCExpr *Value) {
   report_fatal_error("unsupported directive in streamer");
 }
 
-void MCStreamer::EmitCheriCapability(const MCExpr *Value, unsigned CapSize,
+void MCStreamer::emitCheriCapability(const MCExpr *Value, unsigned CapSize,
                                      SMLoc Loc) {
-  report_fatal_error("EmitCheriCapability is not implemented for this target!");
+  report_fatal_error("emitCheriCapability is not implemented for this target!");
 }
 
-void MCStreamer::EmitCheriCapability(const MCSymbol *Value,
-                                     const MCExpr *Addend, unsigned CapSize,
-                                     SMLoc Loc) {
-  const MCExpr *Expr = MCSymbolRefExpr::create(Value, Context);
-  if (Addend)
-    Expr = MCBinaryExpr::createAdd(Expr, Addend, Context);
-  EmitCheriCapability(Expr, CapSize, Loc);
-}
-
-void MCStreamer::EmitCheriCapability(const MCSymbol *Value, int64_t Addend,
-                                     unsigned CapSize, SMLoc Loc) {
-  EmitCheriCapability(Value, MCConstantExpr::create(Addend, Context), CapSize,
-                      Loc);
-}
-
-void MCStreamer::EmitCheriCapability(const MCSymbol *Value, unsigned CapSize,
-                                     SMLoc Loc) {
-  EmitCheriCapability(Value, nullptr, CapSize, Loc);
+void MCStreamer::emitSymbolCheriCapability(const MCSymbol *Sym,
+                                           unsigned CapSize) {
+  const MCExpr *Expr = MCSymbolRefExpr::create(Sym, getContext());
+  emitCheriCapability(Expr, CapSize);
 }
 
 void MCStreamer::emitCheriIntcap(int64_t Value, unsigned CapSize, SMLoc Loc) {

llvm/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp

@@ -105,7 +105,7 @@ void MipsELFStreamer::emitValueImpl(const MCExpr *Value, unsigned Size,
   Labels.clear();
 }
 
-void MipsELFStreamer::EmitCheriCapability(const MCExpr *Value, unsigned CapSize,
+void MipsELFStreamer::emitCheriCapability(const MCExpr *Value, unsigned CapSize,
                                           SMLoc Loc) {
   visitUsedExpr(*Value);
 

llvm/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h

@@ -75,7 +75,7 @@ class MipsELFStreamer : public MCELFStreamer {
   void createPendingLabelRelocs();
 
 protected:
-  void EmitCheriCapability(const MCExpr *Value, unsigned CapSize,
+  void emitCheriCapability(const MCExpr *Value, unsigned CapSize,
                            SMLoc Loc) override;
 };
 

llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp

@@ -208,7 +208,7 @@ void RISCVELFStreamer::emitCheriIntcap(const MCExpr *Expr, unsigned CapSize,
   emitCheriIntcapGeneric(Expr, CapSize, Loc);
 }
 
-void RISCVELFStreamer::EmitCheriCapability(const MCExpr *Value,
+void RISCVELFStreamer::emitCheriCapability(const MCExpr *Value,
                                            unsigned CapSize, SMLoc Loc) {
   visitUsedExpr(*Value);