[LLD][NFC] Remove getOffsetInFile() workaround.

[avl]

Summary

LLD has workaround for the times when SectionIndex was not passed properly:

LT->getFileLineInfoForAddress(

S->getOffsetInFile() + Offset, nullptr,
DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath, Info));

S->getOffsetInFile() was added to differentiate offsets between
various sections. Now SectionIndex is properly specified.
Thus it is not necessary to use getOffsetInFile() workaround.
See https://reviews.llvm.org/D58194, https://reviews.llvm.org/D58357.

This patch removes getOffsetInFile() workaround.

[MaskRay]

Nice clean-up!

[grimar]

Nice! LGTM with a nit.

lld/ELF/SyntheticSections.cpp

2690–2693

This now seems can be:

// Range list with zero size has no effect.
InputSectionBase *s = sections[r.SectionIndex];
if (s && s != &InputSection::discarded && s->isLive())
  if (r.LowPC != r.HighPC)
    ret.push_back({cast<InputSection>(s), r.LowPC, r.HighPC, cuIdx});

lld/ELF/DWARF.cpp

LLDDwarfObj<ELFT>::findAux(const InputSectionBase &sec, uint64_t pos,
   uint32_t secIndex = file->getSectionIndex(sym);
 
   // An undefined symbol may be a symbol defined in a discarded section. We
   // shall still resolve it. This is important for --gdb-index: the end address
   // offset of an entry in .debug_ranges is relocated. If it is not resolved,
   // its zero value will terminate the decoding of .debug_ranges prematurely.
   Symbol &s = file->getRelocTargetSym(rel);
   uint64_t val = 0;
-  if (auto *dr = dyn_cast<Defined>(&s)) {
+  if (auto *dr = dyn_cast<Defined>(&s))
     val = dr->value;
 
-    // FIXME: We should be consistent about always adding the file
-    // offset or not.
-    if (dr->section->flags & ELF::SHF_ALLOC)
-      val += cast<InputSection>(dr->section)->getOffsetInFile();
-  }
-
   DataRefImpl d;
   d.p = getAddend<ELFT>(rel);
   return RelocAddrEntry{secIndex, RelocationRef(d, nullptr),
                         val,      Optional<object::RelocationRef>(),
                         0,        LLDRelocationResolver<RelTy>::resolve};
 }
 
 template <class ELFT>

lld/ELF/InputFiles.cpp

Optional<DILineInfo> ObjFile<ELFT>::getDILineInfo(InputSectionBase *s,
   ArrayRef<InputSectionBase *> sections = s->file->getSections();
   for (uint64_t curIndex = 0; curIndex < sections.size(); ++curIndex) {
     if (s == sections[curIndex]) {
       sectionIndex = curIndex;
       break;
     }
   }
 
-  // Use fake address calculated by adding section file offset and offset in
-  // section. See comments for ObjectInfo class.
-  return dwarf->getDILineInfo(s->getOffsetInFile() + offset, sectionIndex);
+  return dwarf->getDILineInfo(offset, sectionIndex);
 }
 
 ELFFileBase::ELFFileBase(Kind k, MemoryBufferRef mb) : InputFile(k, mb) {
   ekind = getELFKind(mb, "");
 
   switch (ekind) {
   case ELF32LEKind:
     init<ELF32LE>();

lld/ELF/SyntheticSections.cpp

if (!ranges) {
       warn(toString(sec) + ": " + toString(ranges.takeError()));
       return {};
     }
 
     ArrayRef<InputSectionBase *> sections = sec->file->getSections();
     for (DWARFAddressRange &r : *ranges) {
       if (r.SectionIndex == -1ULL)
         continue;
-      InputSectionBase *s = sections[r.SectionIndex];
-      if (!s || s == &InputSection::discarded || !s->isLive())
-        continue;
       // Range list with zero size has no effect.
-      if (r.LowPC == r.HighPC)
-        continue;
-      auto *isec = cast<InputSection>(s);
-      uint64_t offset = isec->getOffsetInFile();
-      ret.push_back({isec, r.LowPC - offset, r.HighPC - offset, cuIdx});
+      InputSectionBase *s = sections[r.SectionIndex];
+      if (s && s != &InputSection::discarded && s->isLive())
+        if (r.LowPC != r.HighPC)
+          ret.push_back({cast<InputSection>(s), r.LowPC, r.HighPC, cuIdx});
     }
     ++cuIdx;
   }
 
   return ret;
 }
 
 template <class ELFT>