[PATCH] D54917: [ELF] Simplify Symbol::getPltVA logic

[Fangrui Song via Phabricator via llvm-commits]

MaskRay updated this revision to Diff 175582.
MaskRay retitled this revision from "[ELF] Comment about retpoline IPLT in getPltVA" to "[ELF] Simplify Symbol::getPltVA logic".
MaskRay added a comment.

Essentially used ruiu's suggestion to make HeaderSize public


Repository:
  rLLD LLVM Linker

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D54917/new/

https://reviews.llvm.org/D54917

Files:
  ELF/Symbols.cpp
  ELF/SyntheticSections.h
  ELF/Target.h


Index: ELF/Target.h
===================================================================
--- ELF/Target.h
+++ ELF/Target.h
@@ -46,7 +46,7 @@
   virtual void addPltSymbols(InputSection &IS, uint64_t Off) const {}
 
   unsigned getPltEntryOffset(unsigned Index) const {
-    return Index * PltEntrySize + PltHeaderSize;
+    return PltHeaderSize + Index * PltEntrySize;
   }
 
   // Returns true if a relocation only uses the low bits of a value such that
Index: ELF/SyntheticSections.h
===================================================================
--- ELF/SyntheticSections.h
+++ ELF/SyntheticSections.h
@@ -662,10 +662,11 @@
 
   template <class ELFT> void addEntry(Symbol &Sym);
 
+  size_t HeaderSize;
+
 private:
   unsigned getPltRelocOff() const;
   std::vector<std::pair<const Symbol *, unsigned>> Entries;
-  size_t HeaderSize;
   bool IsIplt;
 };
 
Index: ELF/Symbols.cpp
===================================================================
--- ELF/Symbols.cpp
+++ ELF/Symbols.cpp
@@ -144,12 +144,8 @@
 }
 
 uint64_t Symbol::getPltVA() const {
-  if (this->IsInIplt) {
-    if (Config->ZRetpolineplt)
-      return In.Iplt->getVA() + Target->getPltEntryOffset(PltIndex);
-    return In.Iplt->getVA() + PltIndex * Target->PltEntrySize;
-  }
-  return In.Plt->getVA() + Target->getPltEntryOffset(PltIndex);
+  PltSection *Plt = IsInIplt ? In.Iplt : In.Plt;
+  return Plt->getVA() + Plt->HeaderSize + PltIndex * Target->PltEntrySize;
 }
 
 uint64_t Symbol::getPltOffset() const {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54917.175582.patch
Type: text/x-patch
Size: 1489 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181127/930a9d7e/attachment.bin>