Rebase: [Facebook] Revert "[BOLT] Update dynamic relocations from section relocations"

Summary:
This reverts commit 729d29e.

Needed as a workaround for T112872562.

Manual rebase conflict history:
https://phabricator.intern.facebook.com/D35230076
https://phabricator.intern.facebook.com/D35681740

Test Plan: sandcastle

Reviewers: #llvm-bolt

Subscribers: spupyrev

Differential Revision: https://phabricator.intern.facebook.com/D37098481

Author: maksfb

bolt/include/bolt/Core/BinarySection.h

@@ -296,16 +296,6 @@ class BinarySection {
     return make_range(Relocations.begin(), Relocations.end());
   }
 
-  /// Iterate over all dynamic relocations for this section.
-  iterator_range<RelocationSetType::iterator> dynamicRelocations() {
-    return make_range(DynamicRelocations.begin(), DynamicRelocations.end());
-  }
-
-  /// Iterate over all dynamic relocations for this section.
-  iterator_range<RelocationSetType::const_iterator> dynamicRelocations() const {
-    return make_range(DynamicRelocations.begin(), DynamicRelocations.end());
-  }
-
   /// Does this section have any non-pending relocations?
   bool hasRelocations() const { return !Relocations.empty(); }
 

bolt/include/bolt/Core/Relocation.h

@@ -95,9 +95,6 @@ struct Relocation {
   /// Return true if relocation type is for thread local storage.
   static bool isTLS(uint64_t Type);
 
-  /// Return code for a NONE relocation
-  static uint64_t getNone();
-
   /// Return code for a PC-relative 4-byte relocation
   static uint64_t getPC32();
 
@@ -107,10 +104,6 @@ struct Relocation {
   /// Return true if this relocation is PC-relative. Return false otherwise.
   bool isPCRelative() const { return isPCRelative(Type); }
 
-  /// Return true if this relocation is R_*_RELATIVE type. Return false
-  /// otherwise.
-  bool isRelative() const { return isRelative(Type); }
-
   /// Emit relocation at a current \p Streamer' position. The caller is
   /// responsible for setting the position correctly.
   size_t emit(MCStreamer *Streamer) const;

bolt/include/bolt/Rewrite/RewriteInstance.h

@@ -22,7 +22,6 @@
 #include "llvm/Support/Error.h"
 #include <map>
 #include <set>
-#include <unordered_map>
 
 namespace llvm {
 
@@ -132,7 +131,7 @@ class RewriteInstance {
   void processLKSMPLocks();
 
   /// Read relocations from a given section.
-  void readDynamicRelocations(const object::SectionRef &Section, bool IsJmpRel);
+  void readDynamicRelocations(const object::SectionRef &Section);
 
   /// Read relocations from a given section.
   void readRelocations(const object::SectionRef &Section);
@@ -209,10 +208,6 @@ class RewriteInstance {
   /// \p OldAddress address in the original binary.
   uint64_t getNewFunctionAddress(uint64_t OldAddress);
 
-  /// Return address of a function or moved data in the new binary
-  /// corresponding to \p OldAddress address in the original binary.
-  uint64_t getNewFunctionOrDataAddress(uint64_t OldAddress);
-
   /// Return value for the symbol \p Name in the output.
   uint64_t getNewValueForSymbol(const StringRef Name);
 
@@ -324,14 +319,6 @@ class RewriteInstance {
       const std::vector<uint32_t> &NewSectionIndex, WriteFuncTy Write,
       StrTabFuncTy AddToStrTab);
 
-  /// Get output index in dynamic symbol table.
-  uint32_t getOutputDynamicSymbolIndex(const MCSymbol *Symbol) {
-    auto It = SymbolIndex.find(Symbol);
-    if (It != SymbolIndex.end())
-      return It->second;
-    return 0;
-  }
-
   /// Add a notes section containing the BOLT revision and command line options.
   void addBoltInfoSection();
 
@@ -459,19 +446,11 @@ class RewriteInstance {
   /// Location and size of dynamic relocations.
   Optional<uint64_t> DynamicRelocationsAddress;
   uint64_t DynamicRelocationsSize{0};
-  uint64_t DynamicRelativeRelocationsCount{0};
 
   /// PLT relocations are special kind of dynamic relocations stored separately.
   Optional<uint64_t> PLTRelocationsAddress;
   uint64_t PLTRelocationsSize{0};
 
-  /// True if relocation of specified type came from .rela.plt
-  DenseMap<uint64_t, bool> IsJmpRelocation;
-
-  /// Index of specified symbol in the dynamic symbol table. NOTE Currently it
-  /// is filled and used only with the relocations-related symbols.
-  std::unordered_map<const MCSymbol *, uint32_t> SymbolIndex;
-
   /// Store all non-zero symbols in this map for a quick address lookup.
   std::map<uint64_t, llvm::object::SymbolRef> FileSymRefs;
 

bolt/lib/Core/Relocation.cpp

@@ -580,7 +580,11 @@ bool Relocation::isX86GOTPCRELX(uint64_t Type) {
   return Type == ELF::R_X86_64_GOTPCRELX || Type == ELF::R_X86_64_REX_GOTPCRELX;
 }
 
-bool Relocation::isNone(uint64_t Type) { return Type == getNone(); }
+bool Relocation::isNone(uint64_t Type) {
+  if (Arch == Triple::aarch64)
+    return Type == ELF::R_AARCH64_NONE;
+  return Type == ELF::R_X86_64_NONE;
+}
 
 bool Relocation::isRelative(uint64_t Type) {
   if (Arch == Triple::aarch64)
@@ -600,10 +604,10 @@ bool Relocation::isTLS(uint64_t Type) {
   return isTLSX86(Type);
 }
 
-uint64_t Relocation::getNone() {
+bool Relocation::isPCRelative(uint64_t Type) {
   if (Arch == Triple::aarch64)
-    return ELF::R_AARCH64_NONE;
-  return ELF::R_X86_64_NONE;
+    return isPCRelativeAArch64(Type);
+  return isPCRelativeX86(Type);
 }
 
 uint64_t Relocation::getPC32() {
@@ -618,12 +622,6 @@ uint64_t Relocation::getPC64() {
   return ELF::R_X86_64_PC64;
 }
 
-bool Relocation::isPCRelative(uint64_t Type) {
-  if (Arch == Triple::aarch64)
-    return isPCRelativeAArch64(Type);
-  return isPCRelativeX86(Type);
-}
-
 size_t Relocation::emit(MCStreamer *Streamer) const {
   const size_t Size = getSizeForType(Type);
   MCContext &Ctx = Streamer->getContext();