Address comments

Author: Sterling-Augustine

llvm/include/llvm/DebugInfo/DWARF/DWARFCFIPrinter.h

@@ -17,22 +17,9 @@ struct DIDumpOptions;
 
 namespace dwarf {
 
-// This class is separate from CFIProgram to decouple CFIPrograms from the
-// enclosing DWARF dies and type units, which allows using them in lower-level
-// places without build dependencies.
-
-class CFIPrinter {
-public:
-  static void print(const CFIProgram &P, raw_ostream &OS,
-                    DIDumpOptions &DumpOpts, unsigned IndentLevel,
-                    std::optional<uint64_t> Address);
-
-  static void printOperand(raw_ostream &OS, DIDumpOptions &DumpOpts,
-                           const CFIProgram &P,
-                           const CFIProgram::Instruction &Instr,
-                           unsigned OperandIdx, uint64_t Operand,
-                           std::optional<uint64_t> &Address);
-};
+void printCFIProgram(const CFIProgram &P, raw_ostream &OS,
+                     const DIDumpOptions &DumpOpts, unsigned IndentLevel,
+                     std::optional<uint64_t> Address);
 
 } // end namespace dwarf
 

llvm/include/llvm/DebugInfo/DWARF/DWARFCFIProgram.h

@@ -25,8 +25,6 @@ namespace llvm {
 
 namespace dwarf {
 
-class CFIPrinter;
-
 /// Represent a sequence of Call Frame Information instructions that, when read
 /// in order, construct a table mapping PC to frame state. This can also be
 /// referred to as "CFI rules" in DWARF literature to avoid confusion with

llvm/lib/DebugInfo/DWARF/DWARFCFIPrinter.cpp

@@ -24,20 +24,7 @@
 using namespace llvm;
 using namespace dwarf;
 
-void CFIPrinter::print(const CFIProgram &P, raw_ostream &OS,
-                       DIDumpOptions &DumpOpts, unsigned IndentLevel,
-                       std::optional<uint64_t> Address) {
-  for (const auto &Instr : P) {
-    uint8_t Opcode = Instr.Opcode;
-    OS.indent(2 * IndentLevel);
-    OS << P.callFrameString(Opcode) << ":";
-    for (size_t i = 0; i < Instr.Ops.size(); ++i)
-      printOperand(OS, DumpOpts, P, Instr, i, Instr.Ops[i], Address);
-    OS << '\n';
-  }
-}
-
-static void printRegister(raw_ostream &OS, DIDumpOptions &DumpOpts,
+static void printRegister(raw_ostream &OS, const DIDumpOptions &DumpOpts,
                           unsigned RegNum) {
   if (DumpOpts.GetNameForDWARFReg) {
     auto RegName = DumpOpts.GetNameForDWARFReg(RegNum, DumpOpts.IsEH);
@@ -50,11 +37,11 @@ static void printRegister(raw_ostream &OS, DIDumpOptions &DumpOpts,
 }
 
 /// Print \p Opcode's operand number \p OperandIdx which has value \p Operand.
-void CFIPrinter::printOperand(raw_ostream &OS, DIDumpOptions &DumpOpts,
-                              const CFIProgram &P,
-                              const CFIProgram::Instruction &Instr,
-                              unsigned OperandIdx, uint64_t Operand,
-                              std::optional<uint64_t> &Address) {
+static void printOperand(raw_ostream &OS, const DIDumpOptions &DumpOpts,
+                         const CFIProgram &P,
+                         const CFIProgram::Instruction &Instr,
+                         unsigned OperandIdx, uint64_t Operand,
+                         std::optional<uint64_t> &Address) {
   assert(OperandIdx < CFIProgram::MaxOperands);
   uint8_t Opcode = Instr.Opcode;
   CFIProgram::OperandType Type = P.getOperandTypes()[Opcode][OperandIdx];
@@ -118,3 +105,17 @@ void CFIPrinter::printOperand(raw_ostream &OS, DIDumpOptions &DumpOpts,
     break;
   }
 }
+
+void llvm::dwarf::printCFIProgram(const CFIProgram &P, raw_ostream &OS,
+                                  const DIDumpOptions &DumpOpts,
+                                  unsigned IndentLevel,
+                                  std::optional<uint64_t> Address) {
+  for (const auto &Instr : P) {
+    uint8_t Opcode = Instr.Opcode;
+    OS.indent(2 * IndentLevel);
+    OS << P.callFrameString(Opcode) << ":";
+    for (size_t i = 0; i < Instr.Ops.size(); ++i)
+      printOperand(OS, DumpOpts, P, Instr, i, Instr.Ops[i], Address);
+    OS << '\n';
+  }
+}

llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

@@ -603,8 +603,8 @@ void CIE::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const {
     OS << "\n";
   }
   OS << "\n";
-  CFIPrinter::print(CFIs, OS, DumpOpts, /*IndentLevel=*/1,
-                    /*InitialLocation=*/{});
+  printCFIProgram(CFIs, OS, DumpOpts, /*IndentLevel=*/1,
+                  /*InitialLocation=*/{});
   OS << "\n";
 
   if (Expected<UnwindTable> RowsOrErr = UnwindTable::create(this))
@@ -632,7 +632,7 @@ void FDE::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const {
   OS << "  Format:       " << FormatString(IsDWARF64) << "\n";
   if (LSDAAddress)
     OS << format("  LSDA Address: %016" PRIx64 "\n", *LSDAAddress);
-  CFIPrinter::print(CFIs, OS, DumpOpts, /*IndentLevel=*/1, InitialLocation);
+  printCFIProgram(CFIs, OS, DumpOpts, /*IndentLevel=*/1, InitialLocation);
   OS << "\n";
 
   if (Expected<UnwindTable> RowsOrErr = UnwindTable::create(this))

llvm/tools/llvm-readobj/DwarfCFIEHPrinter.h

@@ -229,8 +229,8 @@ void PrinterContext<ELFT>::printEHFrame(const Elf_Shdr *EHFrameShdr) const {
     W.indent();
     auto DumpOpts = DIDumpOptions();
     DumpOpts.IsEH = true;
-    dwarf::CFIPrinter::print(Entry.cfis(), W.getOStream(), DumpOpts,
-                             W.getIndentLevel(), InitialLocation);
+    printCFIProgram(Entry.cfis(), W.getOStream(), DumpOpts, W.getIndentLevel(),
+                    InitialLocation);
     W.unindent();
     W.unindent();
     W.getOStream() << "\n";