From fa2f4395e901df27b77daa0b708c788d4b8d4316 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Wed, 7 Aug 2019 17:18:18 +0000
Subject: [PATCH] API update for change to LLVM's lib/DebugInfo/DWARF

llvm-svn: 368190
---
 lld/ELF/DWARF.cpp             | 10 +++++-----
 lld/ELF/DWARF.h               | 28 ++++++++++++++--------------
 lld/ELF/SyntheticSections.cpp |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lld/ELF/DWARF.cpp b/lld/ELF/DWARF.cpp
index 1e4b36f..21c33df 100644
--- a/lld/ELF/DWARF.cpp
+++ b/lld/ELF/DWARF.cpp
@@ -33,11 +33,11 @@ template <class ELFT> LLDDwarfObj<ELFT>::LLDDwarfObj(ObjFile<ELFT> *obj) {
     if (LLDDWARFSection *m =
             StringSwitch<LLDDWARFSection *>(sec->name)
                 .Case(".debug_addr", &addrSection)
-                .Case(".debug_gnu_pubnames", &gnuPubNamesSection)
-                .Case(".debug_gnu_pubtypes", &gnuPubTypesSection)
+                .Case(".debug_gnu_pubnames", &gnuPubnamesSection)
+                .Case(".debug_gnu_pubtypes", &gnuPubtypesSection)
                 .Case(".debug_info", &infoSection)
-                .Case(".debug_ranges", &rangeSection)
-                .Case(".debug_rnglists", &rngListsSection)
+                .Case(".debug_ranges", &rangesSection)
+                .Case(".debug_rnglists", &rnglistsSection)
                 .Case(".debug_line", &lineSection)
                 .Default(nullptr)) {
       m->Data = toStringRef(sec->data());
@@ -50,7 +50,7 @@ template <class ELFT> LLDDwarfObj<ELFT>::LLDDwarfObj(ObjFile<ELFT> *obj) {
     else if (sec->name == ".debug_str")
       strSection = toStringRef(sec->data());
     else if (sec->name == ".debug_line_str")
-      lineStringSection = toStringRef(sec->data());
+      lineStrSection = toStringRef(sec->data());
   }
 }
 
diff --git a/lld/ELF/DWARF.h b/lld/ELF/DWARF.h
index 4260229..9f5e477 100644
--- a/lld/ELF/DWARF.h
+++ b/lld/ELF/DWARF.h
@@ -32,12 +32,12 @@ public:
     f(infoSection);
   }
 
-  const llvm::DWARFSection &getRangeSection() const override {
-    return rangeSection;
+  const llvm::DWARFSection &getRangesSection() const override {
+    return rangesSection;
   }
 
   const llvm::DWARFSection &getRnglistsSection() const override {
-    return rngListsSection;
+    return rnglistsSection;
   }
 
   const llvm::DWARFSection &getLineSection() const override {
@@ -48,18 +48,18 @@ public:
     return addrSection;
   }
 
-  const llvm::DWARFSection &getGnuPubNamesSection() const override {
-    return gnuPubNamesSection;
+  const llvm::DWARFSection &getGnuPubnamesSection() const override {
+    return gnuPubnamesSection;
   }
 
-  const llvm::DWARFSection &getGnuPubTypesSection() const override {
-    return gnuPubTypesSection;
+  const llvm::DWARFSection &getGnuPubtypesSection() const override {
+    return gnuPubtypesSection;
   }
 
   StringRef getFileName() const override { return ""; }
   StringRef getAbbrevSection() const override { return abbrevSection; }
-  StringRef getStringSection() const override { return strSection; }
-  StringRef getLineStringSection() const override { return lineStringSection; }
+  StringRef getStrSection() const override { return strSection; }
+  StringRef getLineStrSection() const override { return lineStrSection; }
 
   bool isLittleEndian() const override {
     return ELFT::TargetEndianness == llvm::support::little;
@@ -74,16 +74,16 @@ private:
                                                uint64_t pos,
                                                ArrayRef<RelTy> rels) const;
 
-  LLDDWARFSection gnuPubNamesSection;
-  LLDDWARFSection gnuPubTypesSection;
+  LLDDWARFSection gnuPubnamesSection;
+  LLDDWARFSection gnuPubtypesSection;
   LLDDWARFSection infoSection;
-  LLDDWARFSection rangeSection;
-  LLDDWARFSection rngListsSection;
+  LLDDWARFSection rangesSection;
+  LLDDWARFSection rnglistsSection;
   LLDDWARFSection lineSection;
   LLDDWARFSection addrSection;
   StringRef abbrevSection;
   StringRef strSection;
-  StringRef lineStringSection;
+  StringRef lineStrSection;
 };
 
 } // namespace elf
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
index cc47033..bab6a8a 100644
--- a/lld/ELF/SyntheticSections.cpp
+++ b/lld/ELF/SyntheticSections.cpp
@@ -2505,8 +2505,8 @@ template <class ELFT>
 static std::vector<GdbIndexSection::NameAttrEntry>
 readPubNamesAndTypes(const LLDDwarfObj<ELFT> &obj,
                      const std::vector<GdbIndexSection::CuEntry> &cUs) {
-  const DWARFSection &pubNames = obj.getGnuPubNamesSection();
-  const DWARFSection &pubTypes = obj.getGnuPubTypesSection();
+  const DWARFSection &pubNames = obj.getGnuPubnamesSection();
+  const DWARFSection &pubTypes = obj.getGnuPubtypesSection();
 
   std::vector<GdbIndexSection::NameAttrEntry> ret;
   for (const DWARFSection *pub : {&pubNames, &pubTypes}) {
-- 
2.7.4