[LLD] Fix Clang-tidy modernize-use-override warnings, other minor fixes

[Eugene.Zelenko]

Summary

I checked this patch on my own build on RHEL 6. Regressions were OK.

[ruiu]

LGTM
2015/11/03 16:48 "Eugene Zelenko" <[e-mail]>:

Eugene.Zelenko created this revision.
Eugene.Zelenko added a reviewer: ruiu.
Eugene.Zelenko added a subscriber: llvm-commits.
Eugene.Zelenko set the repository for this revision to rL LLVM.

I checked this patch on my own build on RHEL 6. Regressions were OK.

Repository:

rL LLVM

http://reviews.llvm.org/D14310

Files:

ELF/OutputSections.h
lib/ReaderWriter/MachO/SectCreateFile.h

Index: lib/ReaderWriter/MachO/SectCreateFile.h

• lib/ReaderWriter/MachO/SectCreateFile.h

+++ lib/ReaderWriter/MachO/SectCreateFile.h
@@ -23,7 +23,6 @@
//
class SectCreateFile : public File {
public:

• class SectCreateAtom : public SimpleDefinedAtom { public: SectCreateAtom(const File &file, StringRef segName, StringRef

sectName,
@@ -68,19 +67,19 @@

new (allocator()) SectCreateAtom(*this, seg, sect,

std::move(content)));

}

• const AtomVector<DefinedAtom> &defined() const {

+ const AtomVector<DefinedAtom> &defined() const override {

  return _definedAtoms;
}

• const AtomVector<UndefinedAtom> &undefined() const {

+ const AtomVector<UndefinedAtom> &undefined() const override {

  return _noUndefinedAtoms;
}

• const AtomVector<SharedLibraryAtom> &sharedLibrary() const {

+ const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {

  return _noSharedLibraryAtoms;
}

• const AtomVector<AbsoluteAtom> &absolute() const {

+ const AtomVector<AbsoluteAtom> &absolute() const override {

  return _noAbsoluteAtoms;
}

Index: ELF/OutputSections.h

• ELF/OutputSections.h

+++ ELF/OutputSections.h
@@ -247,7 +247,7 @@
class InterpSection final : public OutputSectionBase<ELFT> {
public:

InterpSection();

• void writeTo(uint8_t *Buf);

+ void writeTo(uint8_t *Buf) override;
};

template <class ELFT>
@@ -385,6 +385,8 @@
template <class ELFT> StringTableSection<ELFT> *Out<ELFT>::StrTab;
template <class ELFT> SymbolTableSection<ELFT> *Out<ELFT>::DynSymTab;
template <class ELFT> SymbolTableSection<ELFT> *Out<ELFT>::SymTab;
-}
-}
-#endif
+
+} namespace elf2
+} namespace lld
+
+#endif // LLD_ELF_OUTPUT_SECTIONS_H

lld/trunk/ELF/OutputSections.h

 private:
   llvm::StringTableBuilder Builder{llvm::StringTableBuilder::RAW};
 };
 
 template <class ELFT>
 class InterpSection final : public OutputSectionBase<ELFT> {
 public:
   InterpSection();
-  void writeTo(uint8_t *Buf);
+  void writeTo(uint8_t *Buf) override;
 };
 
 template <class ELFT>
 class StringTableSection final : public OutputSectionBase<ELFT> {
 public:
   typedef typename llvm::object::ELFFile<ELFT>::uintX_t uintX_t;
   StringTableSection(StringRef Name, bool Dynamic);
   void add(StringRef S) { StrTabBuilder.add(S); }

 template <class ELFT> RelocationSection<ELFT> *Out<ELFT>::RelaDyn;
 template <class ELFT> RelocationSection<ELFT> *Out<ELFT>::RelaPlt;
 template <class ELFT> StringTableSection<ELFT> *Out<ELFT>::DynStrTab;
 template <class ELFT> StringTableSection<ELFT> *Out<ELFT>::ShStrTab;
 template <class ELFT> StringTableSection<ELFT> *Out<ELFT>::StrTab;
 template <class ELFT> SymbolTableSection<ELFT> *Out<ELFT>::DynSymTab;
 template <class ELFT> SymbolTableSection<ELFT> *Out<ELFT>::SymTab;
 template <class ELFT> typename Out<ELFT>::uintX_t Out<ELFT>::TlsInitImageVA;
-}
-}
-#endif
+
+} // namespace elf2
+} // namespace lld
+
+#endif // LLD_ELF_OUTPUT_SECTIONS_H

lld/trunk/lib/ReaderWriter/MachO/SectCreateFile.h

 namespace mach_o {
 
 //
 // A FlateNamespaceFile instance may be added as a resolution source of last
 // resort, depending on how -flat_namespace and -undefined are set.
 //
 class SectCreateFile : public File {
 public:
-
   class SectCreateAtom : public SimpleDefinedAtom {
   public:
     SectCreateAtom(const File &file, StringRef segName, StringRef sectName,
                    std::unique_ptr<MemoryBuffer> content)
       : SimpleDefinedAtom(file),
         _combinedName((segName + "/" + sectName).str()),
         _content(std::move(content)) {}
 
public:
   SectCreateFile() : File("sectcreate", kindObject) {}
 
   void addSection(StringRef seg, StringRef sect,
                   std::unique_ptr<MemoryBuffer> content) {
     _definedAtoms.push_back(
       new (allocator()) SectCreateAtom(*this, seg, sect, std::move(content)));
   }
 
-  const AtomVector<DefinedAtom> &defined() const {
+  const AtomVector<DefinedAtom> &defined() const override {
     return _definedAtoms;
   }
 
-  const AtomVector<UndefinedAtom> &undefined() const {
+  const AtomVector<UndefinedAtom> &undefined() const override {
     return _noUndefinedAtoms;
   }
 
-  const AtomVector<SharedLibraryAtom> &sharedLibrary() const {
+  const AtomVector<SharedLibraryAtom> &sharedLibrary() const override {
     return _noSharedLibraryAtoms;
   }
 
-  const AtomVector<AbsoluteAtom> &absolute() const {
+  const AtomVector<AbsoluteAtom> &absolute() const override {
     return _noAbsoluteAtoms;
   }
 
 private:
   AtomVector<DefinedAtom> _definedAtoms;
 };
 
 } // namespace mach_o
 } // namespace lld
 
 #endif // LLD_READER_WRITER_MACHO_SECTCREATE_FILE_H