[BOLT][NFC] Move printRelocationInfo into a method

[Amir]

Summary

Move this large lambda out of readRelocations into a standalone method.

[rafauler]

LGTM

[Amir]

rebase

[Amir]

clang-format

bolt/include/bolt/Rewrite/RewriteInstance.h

private:
   void processLKBugTable();
 
   /// Process special linux kernel section, .smp_locks.
   void processLKSMPLocks();
 
   /// Read relocations from a given section.
   void readDynamicRelocations(const object::SectionRef &Section, bool IsJmpRel);
 
+  /// Print relocation information.
+  void printRelocationInfo(const RelocationRef &Rel, StringRef SymbolName,
+                           uint64_t SymbolAddress, uint64_t Addend,
+                           uint64_t ExtractedValue) const;
+
   /// Read relocations from a given section.
   void readRelocations(const object::SectionRef &Section);
 
   /// Mark functions that are not meant for processing as ignored.
   void selectFunctionsToProcess();
 
   /// Read information from debug sections.
   void readDebugInfo();

bolt/lib/Rewrite/RewriteInstance.cpp

for (const RelocationRef &Rel : Section.relocations()) {
 
     if (Symbol)
       SymbolIndex[Symbol] = getRelocationSymbol(InputFile, Rel);
 
     BC->addDynamicRelocation(Rel.getOffset(), Symbol, RType, Addend);
   }
 }
 
+void RewriteInstance::printRelocationInfo(const RelocationRef &Rel,
+                                          StringRef SymbolName,
+                                          uint64_t SymbolAddress,
+                                          uint64_t Addend,
+                                          uint64_t ExtractedValue) const {
+  SmallString<16> TypeName;
+  Rel.getTypeName(TypeName);
+  const uint64_t Address = SymbolAddress + Addend;
+  const uint64_t Offset = Rel.getOffset();
+  ErrorOr<BinarySection &> Section = BC->getSectionForAddress(SymbolAddress);
+  BinaryFunction *Func =
+      BC->getBinaryFunctionContainingAddress(Offset, false, BC->isAArch64());
+  dbgs() << formatv("Relocation: offset = {0:x}; type = {1}; value = {2:x}; ",
+                    Offset, TypeName, ExtractedValue)
+         << formatv("symbol = {0} ({1}); symbol address = {2:x}; ", SymbolName,
+                    Section ? Section->getName() : "", SymbolAddress)
+         << formatv("addend = {0:x}; address = {1:x}; in = ", Addend, Address);
+  if (Func)
+    dbgs() << Func->getPrintName();
+  else
+    dbgs() << BC->getSectionForAddress(Rel.getOffset())->getName();
+  dbgs() << '\n';
+}
+
 void RewriteInstance::readRelocations(const SectionRef &Section) {
   LLVM_DEBUG({
     StringRef SectionName = cantFail(Section.getName());
     dbgs() << "BOLT-DEBUG: reading relocations for section " << SectionName
            << ":\n";
   });
   if (BinarySection(*BC, Section).isAllocatable()) {
     LLVM_DEBUG(dbgs() << "BOLT-DEBUG: ignoring runtime relocations\n");
if (SkipRelocs) {
     LLVM_DEBUG(
         dbgs() << "BOLT-DEBUG: ignoring relocations against known section\n");
     return;
   }
 
   const bool IsAArch64 = BC->isAArch64();
   const bool IsFromCode = RelocatedSection.isText();
 
-  auto printRelocationInfo = [&](const RelocationRef &Rel,
-                                 StringRef SymbolName,
-                                 uint64_t SymbolAddress,
-                                 uint64_t Addend,
-                                 uint64_t ExtractedValue) {
-    SmallString<16> TypeName;
-    Rel.getTypeName(TypeName);
-    const uint64_t Address = SymbolAddress + Addend;
-    ErrorOr<BinarySection &> Section = BC->getSectionForAddress(SymbolAddress);
-    dbgs() << "Relocation: offset = 0x"
-           << Twine::utohexstr(Rel.getOffset())
-           << "; type = " << TypeName
-           << "; value = 0x" << Twine::utohexstr(ExtractedValue)
-           << "; symbol = " << SymbolName
-           << " (" << (Section ? Section->getName() : "") << ")"
-           << "; symbol address = 0x" << Twine::utohexstr(SymbolAddress)
-           << "; addend = 0x" << Twine::utohexstr(Addend)
-           << "; address = 0x" << Twine::utohexstr(Address)
-           << "; in = ";
-    if (BinaryFunction *Func = BC->getBinaryFunctionContainingAddress(
-            Rel.getOffset(), false, IsAArch64))
-      dbgs() << Func->getPrintName() << "\n";
-    else
-      dbgs() << BC->getSectionForAddress(Rel.getOffset())->getName() << "\n";
-  };
-
   for (const RelocationRef &Rel : Section.relocations()) {
     SmallString<16> TypeName;
     Rel.getTypeName(TypeName);
     uint64_t RType = Rel.getType();
     if (Relocation::skipRelocationType(RType))
       continue;
 
     // Adjust the relocation type as the linker might have skewed it.