From 3f2e9e5e79687c5589cef23cb93badabdec6736f Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Sat, 8 Feb 2014 06:07:27 +0000 Subject: Add LLVM_OVERRIDE to a few declarations. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201022 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../llvm/CodeGen/TargetLoweringObjectFileImpl.h | 110 +++++++++++---------- lib/Target/ARM/ARMTargetObjectFile.h | 14 +-- lib/Target/Hexagon/HexagonTargetObjectFile.h | 10 +- lib/Target/Mips/MipsTargetObjectFile.h | 8 +- lib/Target/NVPTX/NVPTXTargetObjectFile.h | 11 ++- lib/Target/PowerPC/PPCTargetObjectFile.h | 12 ++- lib/Target/Sparc/SparcTargetObjectFile.h | 9 +- lib/Target/X86/X86TargetObjectFile.h | 25 ++--- lib/Target/XCore/XCoreTargetObjectFile.h | 21 ++-- 9 files changed, 119 insertions(+), 101 deletions(-) diff --git a/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h b/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h index 2e582ec051..9660a065a0 100644 --- a/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h +++ b/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h @@ -38,40 +38,40 @@ class TargetLoweringObjectFileELF : public TargetLoweringObjectFile { public: virtual ~TargetLoweringObjectFileELF() {} - virtual void emitPersonalityValue(MCStreamer &Streamer, - const TargetMachine &TM, - const MCSymbol *Sym) const; + void emitPersonalityValue(MCStreamer &Streamer, const TargetMachine &TM, + const MCSymbol *Sym) const LLVM_OVERRIDE; /// Given a constant with the SectionKind, return a section that it should be /// placed in. - virtual const MCSection *getSectionForConstant(SectionKind Kind) const; + const MCSection *getSectionForConstant(SectionKind Kind) const LLVM_OVERRIDE; + const MCSection *getExplicitSectionGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; - virtual const MCSection * - getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; - - virtual const MCSection * - SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; + const MCSection *SelectSectionForGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; /// Return an MCExpr to use for a reference to the specified type info global /// variable from exception handling information. - virtual const MCExpr * - getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI, unsigned Encoding, - MCStreamer &Streamer) const; + const MCExpr *getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI, + unsigned Encoding, + MCStreamer &Streamer) const + LLVM_OVERRIDE; // The symbol that gets passed to .cfi_personality. - virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI) const; + MCSymbol *getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const LLVM_OVERRIDE; void InitializeELF(bool UseInitArray_); - virtual const MCSection * - getStaticCtorSection(unsigned Priority = 65535) const; - virtual const MCSection * - getStaticDtorSection(unsigned Priority = 65535) const; + const MCSection *getStaticCtorSection(unsigned Priority = 65535) const + LLVM_OVERRIDE; + const MCSection *getStaticDtorSection(unsigned Priority = 65535) const + LLVM_OVERRIDE; }; @@ -82,39 +82,42 @@ public: /// Extract the dependent library name from a linker option string. Returns /// StringRef() if the option does not specify a library. - virtual StringRef getDepLibFromLinkerOpt(StringRef LinkerOption) const; + StringRef getDepLibFromLinkerOpt(StringRef LinkerOption) const LLVM_OVERRIDE; /// Emit the module flags that specify the garbage collection information. - virtual void emitModuleFlags(MCStreamer &Streamer, - ArrayRef ModuleFlags, - Mangler *Mang, const TargetMachine &TM) const; + void emitModuleFlags(MCStreamer &Streamer, + ArrayRef ModuleFlags, + Mangler *Mang, const TargetMachine &TM) const + LLVM_OVERRIDE; - virtual const MCSection * - SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; + const MCSection *SelectSectionForGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; - virtual const MCSection * - getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; + const MCSection *getExplicitSectionGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; - virtual const MCSection *getSectionForConstant(SectionKind Kind) const; + const MCSection *getSectionForConstant(SectionKind Kind) const LLVM_OVERRIDE; /// This hook allows targets to selectively decide not to emit the /// UsedDirective for some symbols in llvm.used. /// FIXME: REMOVE this (rdar://7071300) - virtual bool shouldEmitUsedDirectiveFor(const GlobalValue *GV, - Mangler *) const; + bool shouldEmitUsedDirectiveFor(const GlobalValue *GV, Mangler *Mang) const + LLVM_OVERRIDE; /// The mach-o version of this method defaults to returning a stub reference. - virtual const MCExpr * - getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI, unsigned Encoding, - MCStreamer &Streamer) const; + const MCExpr *getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI, + unsigned Encoding, + MCStreamer &Streamer) const + LLVM_OVERRIDE; // The symbol that gets passed to .cfi_personality. - virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI) const; + MCSymbol *getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const LLVM_OVERRIDE; }; @@ -123,23 +126,26 @@ class TargetLoweringObjectFileCOFF : public TargetLoweringObjectFile { public: virtual ~TargetLoweringObjectFileCOFF() {} - virtual const MCSection * - getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; + const MCSection *getExplicitSectionGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; - virtual const MCSection * - SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; + const MCSection *SelectSectionForGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; /// Extract the dependent library name from a linker option string. Returns /// StringRef() if the option does not specify a library. - virtual StringRef getDepLibFromLinkerOpt(StringRef LinkerOption) const; + StringRef getDepLibFromLinkerOpt(StringRef LinkerOption) const LLVM_OVERRIDE; /// Emit Obj-C garbage collection and linker options. Only linker option /// emission is implemented for COFF. - virtual void emitModuleFlags(MCStreamer &Streamer, - ArrayRef ModuleFlags, - Mangler *Mang, const TargetMachine &TM) const; + void emitModuleFlags(MCStreamer &Streamer, + ArrayRef ModuleFlags, + Mangler *Mang, const TargetMachine &TM) const + LLVM_OVERRIDE; }; } // end namespace llvm diff --git a/lib/Target/ARM/ARMTargetObjectFile.h b/lib/Target/ARM/ARMTargetObjectFile.h index 9767045ace..b3460c491b 100644 --- a/lib/Target/ARM/ARMTargetObjectFile.h +++ b/lib/Target/ARM/ARMTargetObjectFile.h @@ -26,15 +26,17 @@ public: AttributesSection(NULL) {} - virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + void Initialize(MCContext &Ctx, const TargetMachine &TM) LLVM_OVERRIDE; - const MCExpr * - getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI, unsigned Encoding, - MCStreamer &Streamer) const; + const MCExpr *getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI, + unsigned Encoding, + MCStreamer &Streamer) const + LLVM_OVERRIDE; /// \brief Describe a TLS variable address within debug info. - virtual const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const; + const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const + LLVM_OVERRIDE; }; } // end namespace llvm diff --git a/lib/Target/Hexagon/HexagonTargetObjectFile.h b/lib/Target/Hexagon/HexagonTargetObjectFile.h index 41f6792ca8..73fa47975b 100644 --- a/lib/Target/Hexagon/HexagonTargetObjectFile.h +++ b/lib/Target/Hexagon/HexagonTargetObjectFile.h @@ -19,7 +19,7 @@ namespace llvm { const MCSectionELF *SmallDataSection; const MCSectionELF *SmallBSSSection; public: - virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + void Initialize(MCContext &Ctx, const TargetMachine &TM) LLVM_OVERRIDE; /// IsGlobalInSmallSection - Return true if this global address should be /// placed into small data/bss section. @@ -30,10 +30,10 @@ namespace llvm { const TargetMachine &TM) const; bool IsSmallDataEnabled () const; - const MCSection* SelectSectionForGlobal(const GlobalValue *GV, - SectionKind Kind, - Mangler *Mang, - const TargetMachine &TM) const; + const MCSection *SelectSectionForGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; }; } // namespace llvm diff --git a/lib/Target/Mips/MipsTargetObjectFile.h b/lib/Target/Mips/MipsTargetObjectFile.h index 658a49a6d8..11d70db5ba 100644 --- a/lib/Target/Mips/MipsTargetObjectFile.h +++ b/lib/Target/Mips/MipsTargetObjectFile.h @@ -19,7 +19,7 @@ namespace llvm { const MCSection *SmallBSSSection; public: - void Initialize(MCContext &Ctx, const TargetMachine &TM); + void Initialize(MCContext &Ctx, const TargetMachine &TM) LLVM_OVERRIDE; /// IsGlobalInSmallSection - Return true if this global address should be @@ -30,9 +30,9 @@ namespace llvm { const TargetMachine &TM) const; const MCSection *SelectSectionForGlobal(const GlobalValue *GV, - SectionKind Kind, - Mangler *Mang, - const TargetMachine &TM) const; + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; }; } // end namespace llvm diff --git a/lib/Target/NVPTX/NVPTXTargetObjectFile.h b/lib/Target/NVPTX/NVPTXTargetObjectFile.h index 2a7394b79a..31a3c1bd95 100644 --- a/lib/Target/NVPTX/NVPTXTargetObjectFile.h +++ b/lib/Target/NVPTX/NVPTXTargetObjectFile.h @@ -46,7 +46,7 @@ public: virtual ~NVPTXTargetObjectFile(); - virtual void Initialize(MCContext &ctx, const TargetMachine &TM) { + void Initialize(MCContext &ctx, const TargetMachine &TM) LLVM_OVERRIDE { TargetLoweringObjectFile::Initialize(ctx, TM); TextSection = new NVPTXSection(MCSection::SV_ELF, SectionKind::getText()); DataSection = @@ -87,13 +87,14 @@ public: new NVPTXSection(MCSection::SV_ELF, SectionKind::getMetadata()); } - virtual const MCSection *getSectionForConstant(SectionKind Kind) const { + const MCSection *getSectionForConstant(SectionKind Kind) const LLVM_OVERRIDE { return ReadOnlySection; } - virtual const MCSection * - getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const { + const MCSection *getExplicitSectionGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE { return DataSection; } diff --git a/lib/Target/PowerPC/PPCTargetObjectFile.h b/lib/Target/PowerPC/PPCTargetObjectFile.h index 262c52213d..8042a790f7 100644 --- a/lib/Target/PowerPC/PPCTargetObjectFile.h +++ b/lib/Target/PowerPC/PPCTargetObjectFile.h @@ -20,14 +20,16 @@ namespace llvm { /// 64-bit PowerPC Linux. class PPC64LinuxTargetObjectFile : public TargetLoweringObjectFileELF { - virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + void Initialize(MCContext &Ctx, const TargetMachine &TM) LLVM_OVERRIDE; - virtual const MCSection * - SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; + const MCSection *SelectSectionForGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; /// \brief Describe a TLS variable address within debug info. - virtual const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const; + const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const + LLVM_OVERRIDE; }; } // end namespace llvm diff --git a/lib/Target/Sparc/SparcTargetObjectFile.h b/lib/Target/Sparc/SparcTargetObjectFile.h index 7cf850de16..5884e5d97a 100644 --- a/lib/Target/Sparc/SparcTargetObjectFile.h +++ b/lib/Target/Sparc/SparcTargetObjectFile.h @@ -23,10 +23,11 @@ public: TargetLoweringObjectFileELF() {} - const MCExpr * - getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI, unsigned Encoding, - MCStreamer &Streamer) const; + const MCExpr *getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI, + unsigned Encoding, + MCStreamer &Streamer) const + LLVM_OVERRIDE; }; } // end namespace llvm diff --git a/lib/Target/X86/X86TargetObjectFile.h b/lib/Target/X86/X86TargetObjectFile.h index 5fcd0dfba6..77046e2b42 100644 --- a/lib/Target/X86/X86TargetObjectFile.h +++ b/lib/Target/X86/X86TargetObjectFile.h @@ -20,31 +20,34 @@ namespace llvm { /// x86-64. class X86_64MachoTargetObjectFile : public TargetLoweringObjectFileMachO { public: - virtual const MCExpr * - getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI, unsigned Encoding, - MCStreamer &Streamer) const; + const MCExpr *getTTypeGlobalReference(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI, + unsigned Encoding, + MCStreamer &Streamer) const + LLVM_OVERRIDE; // getCFIPersonalitySymbol - The symbol that gets passed to // .cfi_personality. - virtual MCSymbol * - getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, - MachineModuleInfo *MMI) const; + MCSymbol *getCFIPersonalitySymbol(const GlobalValue *GV, Mangler *Mang, + MachineModuleInfo *MMI) const + LLVM_OVERRIDE; }; /// X86LinuxTargetObjectFile - This implementation is used for linux x86 /// and x86-64. class X86LinuxTargetObjectFile : public TargetLoweringObjectFileELF { - virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + void Initialize(MCContext &Ctx, const TargetMachine &TM) LLVM_OVERRIDE; /// \brief Describe a TLS variable address within debug info. - virtual const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const; + const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const + LLVM_OVERRIDE; }; /// \brief This implementation is used for Windows targets on x86 and x86-64. class X86WindowsTargetObjectFile : public TargetLoweringObjectFileCOFF { - virtual const MCExpr *getExecutableRelativeSymbol(const ConstantExpr *CE, - Mangler *Mang) const; + const MCExpr *getExecutableRelativeSymbol(const ConstantExpr *CE, + Mangler *Mang) const + LLVM_OVERRIDE; }; } // end namespace llvm diff --git a/lib/Target/XCore/XCoreTargetObjectFile.h b/lib/Target/XCore/XCoreTargetObjectFile.h index bf9798d508..fee84256b8 100644 --- a/lib/Target/XCore/XCoreTargetObjectFile.h +++ b/lib/Target/XCore/XCoreTargetObjectFile.h @@ -23,15 +23,18 @@ static const unsigned CodeModelLargeSize = 256; public: void Initialize(MCContext &Ctx, const TargetMachine &TM); - virtual const MCSection * - getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; - - virtual const MCSection * - SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, - Mangler *Mang, const TargetMachine &TM) const; - - virtual const MCSection *getSectionForConstant(SectionKind Kind) const; + const MCSection *getExplicitSectionGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; + + const MCSection *SelectSectionForGlobal(const GlobalValue *GV, + SectionKind Kind, Mangler *Mang, + const TargetMachine &TM) const + LLVM_OVERRIDE; + + const MCSection *getSectionForConstant(SectionKind Kind) const + LLVM_OVERRIDE; }; } // end namespace llvm -- cgit v1.2.3