[ELF] Delete dead code used for __cap_relocs in input object files

This should have been cleaned up when CheriCapRelocsSection::addSection
had its implementation (and caller) removed.

Fixes: ed4dee7 ("[ELF][CHERI] GC old __cap_relocs input section code")

Author: jrtc27

lld/ELF/Arch/Cheri.cpp

@@ -183,133 +183,6 @@ std::string CheriCapRelocLocation::toString(Ctx &ctx) const {
   return SymbolAndOffset(section, offset).verboseToString(ctx);
 }
 
-template <class ELFT>
-void CheriCapRelocsSection::processSection(InputSectionBase *s) {
-  // TODO: sort by offset (or is that always true?
-  const auto rels = s->relsOrRelas<ELFT>().relas;
-  for (auto i = rels.begin(), end = rels.end(); i != end; ++i) {
-    const auto &locationRel = *i;
-    ++i;
-    const auto &targetRel = *i;
-    if ((locationRel.r_offset % entsize) != 0) {
-      error(
-          "corrupted __cap_relocs:  expected Relocation offset to be a "
-          "multiple of " +
-          Twine(entsize) + " but got " + Twine(locationRel.r_offset));
-      return;
-    }
-    constexpr unsigned fieldSize = InMemoryCapRelocEntry<ELFT>::fieldSize;
-    if (targetRel.r_offset != locationRel.r_offset + fieldSize) {
-      error("corrupted __cap_relocs: expected target relocation (" +
-            Twine(targetRel.r_offset) +
-            " to directly follow location relocation (" +
-            Twine(locationRel.r_offset) + ")");
-      return;
-    }
-    if (locationRel.r_addend < 0) {
-      Msg(ctx) << "corrupted __cap_relocs: addend is less than zero in" << *s
-               << ": " << Twine(locationRel.r_addend);
-      return;
-    }
-    uint64_t capRelocsOffset = locationRel.r_offset;
-    assert(capRelocsOffset + entsize <= s->getSize());
-    if (ctx.arg.emachine == EM_MIPS) {
-      if (locationRel.getType(ctx.arg.isMips64EL) != R_MIPS_64) {
-        error("Exptected a R_MIPS_64 relocation in __cap_relocs but got " +
-              toString(locationRel.getType(ctx.arg.isMips64EL)));
-        continue;
-      }
-      if (targetRel.getType(ctx.arg.isMips64EL) != R_MIPS_64) {
-        error("Exptected a R_MIPS_64 relocation in __cap_relocs but got " +
-              toString(targetRel.getType(ctx.arg.isMips64EL)));
-        continue;
-      }
-    } else {
-      if (locationRel.getType(ctx.arg.isMips64EL) !=
-          *ctx.target->absPointerRel) {
-        error(
-            "Exptected an absolute pointer relocation in __cap_relocs "
-            "but got " +
-            toString(locationRel.getType(ctx.arg.isMips64EL)));
-        continue;
-      }
-      if (targetRel.getType(ctx.arg.isMips64EL) != *ctx.target->absPointerRel) {
-        error(
-            "Exptected an absolute pointer relocation in __cap_relocs "
-            "but got " +
-            toString(targetRel.getType(ctx.arg.isMips64EL)));
-        continue;
-      }
-    }
-    Symbol *locationSym = &s->getFile<ELFT>()->getRelocTargetSym(locationRel);
-    Symbol &targetSym = s->getFile<ELFT>()->getRelocTargetSym(targetRel);
-
-    if (locationSym->file != s->file) {
-      Err(ctx) << "Expected capability relocation to point to " << *s->file
-               << " but got " << *locationSym->file;
-      continue;
-    }
-    //    errs() << "Adding cap reloc at " << toString(LocationSym) << " type "
-    //           << Twine((int)LocationSym.Type) << " against "
-    //           << toString(TargetSym) << "\n";
-    auto *rawInput = reinterpret_cast<const InMemoryCapRelocEntry<ELFT> *>(
-        s->content().begin() + capRelocsOffset);
-    int64_t targetCapabilityOffset = (int64_t)rawInput->offset;
-    assert(rawInput->size == 0 &&
-           "Clang should not have set size in __cap_relocs");
-    if (!isa<Defined>(locationSym)) {
-      error("Unhandled symbol kind for cap_reloc: " +
-            Twine(locationSym->kind()));
-      continue;
-    }
-
-    const SymbolAndOffset relocLocation{locationSym, locationRel.r_addend};
-    const SymbolAndOffset relocTarget{&targetSym, targetRel.r_addend};
-    SymbolAndOffset realLocation = relocLocation.findRealSymbol(ctx);
-    SymbolAndOffset realTarget = relocTarget.findRealSymbol(ctx);
-    if (ctx.arg.verboseCapRelocs) {
-      message("Adding capability relocation at " +
-              realLocation.verboseToString(ctx) + "\nagainst " +
-              realTarget.verboseToString(ctx));
-    }
-
-    bool targetNeedsDynReloc = false;
-    if (targetSym.isPreemptible) {
-      // Do we need this?
-      // TargetNeedsDynReloc = true;
-    }
-    switch (targetSym.kind()) {
-      case Symbol::DefinedKind:
-        break;
-      case Symbol::SharedKind:
-        if (!hasDynamicLinker(ctx)) {
-          error(
-              "cannot create a capability relocation against a shared symbol"
-              " when linking statically");
-          continue;
-        }
-        targetNeedsDynReloc = true;
-        break;
-      case Symbol::UndefinedKind:
-        // addCapReloc() will add an error if we are building an executable
-        // instead of a shlib
-        // TODO: we really should add a dynamic SIZE relocation as well
-        targetNeedsDynReloc = true;
-        break;
-      default:
-        error("Unhandled symbol kind for cap_reloc target: " +
-              Twine(targetSym.kind()));
-        continue;
-    }
-    assert(locationSym->isSection());
-    auto *locationDef = cast<Defined>(locationSym);
-    auto *locationSec = cast<InputSectionBase>(locationDef->section);
-    addCapReloc<ELFT>({locationSec, (uint64_t)locationRel.r_addend}, realTarget,
-                      targetNeedsDynReloc, targetCapabilityOffset,
-                      realLocation.sym());
-  }
-}
-
 template <class ELFT>
 void CheriCapRelocsSection::addCapReloc(CheriCapRelocLocation loc,
                                         const SymbolAndOffset &target,

lld/ELF/Arch/Cheri.h

@@ -76,9 +76,6 @@ struct CheriCapReloc {
 class CheriCapRelocsSection : public SyntheticSection {
 public:
   CheriCapRelocsSection(Ctx &ctx, StringRef name);
-  // Add a __cap_relocs section from in input object file
-  template <class ELFT>
-  void addSection(InputSectionBase *s);
   bool isNeeded() const override { return !relocsMap.empty(); }
   size_t getSize() const override { return relocsMap.size() * entsize; }
   void writeTo(uint8_t *buf) override;
@@ -89,7 +86,6 @@ class CheriCapRelocsSection : public SyntheticSection {
 
 private:
   template <class ELFT> void writeToImpl(uint8_t *);
-  template <class ELFT> void processSection(InputSectionBase *s);
   bool addEntry(CheriCapRelocLocation loc, CheriCapReloc relocation) {
     auto it = relocsMap.insert(std::make_pair(loc, relocation));
     // assert(it.first->second == Relocation);