Revert "[BOLT][NFC] Simplify addRelocation"

This reverts commit 29f2301.

This change breaks one of the internal tests.

Author: aaupov

bolt/include/bolt/Core/BinarySection.h

@@ -326,7 +326,16 @@ class BinarySection {
 
   /// Add a new relocation at the given /p Offset.
   void addRelocation(uint64_t Offset, MCSymbol *Symbol, uint64_t Type,
-                     uint64_t Addend, uint64_t Value = 0, bool Pending = false);
+                     uint64_t Addend, uint64_t Value = 0,
+                     bool Pending = false) {
+    assert(Offset < getSize() && "offset not within section bounds");
+    if (!Pending) {
+      Relocations.emplace(Relocation{Offset, Symbol, Type, Addend, Value});
+    } else {
+      PendingRelocations.emplace_back(
+          Relocation{Offset, Symbol, Type, Addend, Value});
+    }
+  }
 
   /// Add a dynamic relocation at the given /p Offset.
   void addDynamicRelocation(uint64_t Offset, MCSymbol *Symbol, uint64_t Type,

bolt/lib/Core/BinarySection.cpp

@@ -176,20 +176,6 @@ BinarySection::~BinarySection() {
 
 void BinarySection::clearRelocations() { clearList(Relocations); }
 
-void BinarySection::addRelocation(uint64_t Offset, MCSymbol *Symbol,
-                                  uint64_t Type, uint64_t Addend,
-                                  uint64_t Value, bool Pending) {
-  assert(Offset < getSize() && "offset not within section bounds");
-  LLVM_DEBUG(dbgs() << formatv(
-                 "BOLT-DEBUG: addRelocation in {0}, @{1:x} against {2}\n",
-                 getName(), Offset, Symbol->getName()));
-  Relocation R{Offset, Symbol, Type, Addend, Value};
-  if (Pending)
-    PendingRelocations.emplace_back(R);
-  else
-    Relocations.emplace(R);
-}
-
 void BinarySection::print(raw_ostream &OS) const {
   OS << getName() << ", "
      << "0x" << Twine::utohexstr(getAddress()) << ", " << getSize() << " (0x"