From: Hans Wennborg Date: Thu, 10 Sep 2015 00:12:56 +0000 (+0000) Subject: Fix Clang-tidy misc-use-override warnings, other minor fixes X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=bfd007fd70543c448448e0594e869d235b661a82 Fix Clang-tidy misc-use-override warnings, other minor fixes Patch by Eugene Zelenko! Differential Revision: http://reviews.llvm.org/D12740 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247216 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/CodeGen/MIRParser/MIRParser.h b/include/llvm/CodeGen/MIRParser/MIRParser.h index 67b756d5e88..a569d5ec1f5 100644 --- a/include/llvm/CodeGen/MIRParser/MIRParser.h +++ b/include/llvm/CodeGen/MIRParser/MIRParser.h @@ -1,4 +1,4 @@ -//===- MIRParser.h - MIR serialization format parser ----------------------===// +//===- MIRParser.h - MIR serialization format parser ------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -37,7 +37,7 @@ class MIRParser : public MachineFunctionInitializer { public: MIRParser(std::unique_ptr Impl); MIRParser(const MIRParser &) = delete; - ~MIRParser(); + ~MIRParser() override; /// Parse the optional LLVM IR module that's embedded in the MIR file. /// @@ -78,4 +78,4 @@ createMIRParser(std::unique_ptr Contents, LLVMContext &Context); } // end namespace llvm -#endif +#endif // LLVM_CODEGEN_MIRPARSER_MIRPARSER_H diff --git a/include/llvm/ExecutionEngine/RuntimeDyld.h b/include/llvm/ExecutionEngine/RuntimeDyld.h index 7aaee150566..9bdb6d42506 100644 --- a/include/llvm/ExecutionEngine/RuntimeDyld.h +++ b/include/llvm/ExecutionEngine/RuntimeDyld.h @@ -69,7 +69,8 @@ public: virtual object::OwningBinary getObjectForDebug(const object::ObjectFile &Obj) const = 0; - uint64_t getSectionLoadAddress(const object::SectionRef &Sec) const; + uint64_t + getSectionLoadAddress(const object::SectionRef &Sec) const override; protected: virtual void anchor(); @@ -95,7 +96,7 @@ public: /// \brief Memory Management. class MemoryManager { public: - virtual ~MemoryManager() {} + virtual ~MemoryManager() = default; /// Allocate a memory block of (at least) the given size suitable for /// executable code. The SectionID is a unique identifier assigned by the @@ -157,7 +158,7 @@ public: /// \brief Symbol resolution. class SymbolResolver { public: - virtual ~SymbolResolver() {} + virtual ~SymbolResolver() = default; /// This method returns the address of the specified function or variable. /// It is used to resolve symbols during module linking. @@ -252,4 +253,4 @@ private: } // end namespace llvm -#endif +#endif // LLVM_EXECUTIONENGINE_RUNTIMEDYLD_H diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index d5374d4447a..c59eaad3635 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -507,7 +507,7 @@ public: explicit raw_svector_ostream(SmallVectorImpl &O) : OS(O) { SetUnbuffered(); } - ~raw_svector_ostream() override {} + ~raw_svector_ostream() override = default; void flush() = delete; @@ -536,9 +536,9 @@ class buffer_ostream : public raw_svector_ostream { public: buffer_ostream(raw_ostream &OS) : raw_svector_ostream(Buffer), OS(OS) {} - ~buffer_ostream() { OS << str(); } + ~buffer_ostream() override { OS << str(); } }; } // end llvm namespace -#endif +#endif // LLVM_SUPPORT_RAW_OSTREAM_H diff --git a/include/llvm/TableGen/Record.h b/include/llvm/TableGen/Record.h index 2bbb1b90339..e9159bfc6d3 100644 --- a/include/llvm/TableGen/Record.h +++ b/include/llvm/TableGen/Record.h @@ -58,7 +58,7 @@ public: RecTyKind getRecTyKind() const { return Kind; } RecTy(RecTyKind K) : Kind(K) {} - virtual ~RecTy() {} + virtual ~RecTy() = default; virtual std::string getAsString() const = 0; void print(raw_ostream &OS) const { OS << getAsString(); } @@ -267,7 +267,7 @@ protected: explicit Init(InitKind K) : Kind(K) {} public: - virtual ~Init() {} + virtual ~Init() = default; /// isComplete - This virtual method should be overridden by values that may /// not be completely specified yet. @@ -366,7 +366,7 @@ class TypedInit : public Init { protected: explicit TypedInit(InitKind K, RecTy *T) : Init(K), Ty(T) {} - ~TypedInit() { + ~TypedInit() override { // If this is a DefInit we need to delete the RecordRecTy. if (getKind() == IK_DefInit) delete Ty; @@ -1587,6 +1587,6 @@ Init *QualifyName(Record &CurRec, MultiClass *CurMultiClass, Init *QualifyName(Record &CurRec, MultiClass *CurMultiClass, const std::string &Name, const std::string &Scoper); -} // End llvm namespace +} // end llvm namespace -#endif +#endif // LLVM_TABLEGEN_RECORD_H diff --git a/lib/CodeGen/MIRPrintingPass.cpp b/lib/CodeGen/MIRPrintingPass.cpp index 13d61e65d7e..8e7566a4e46 100644 --- a/lib/CodeGen/MIRPrintingPass.cpp +++ b/lib/CodeGen/MIRPrintingPass.cpp @@ -40,7 +40,7 @@ struct MIRPrintingPass : public MachineFunctionPass { MachineFunctionPass::getAnalysisUsage(AU); } - virtual bool runOnMachineFunction(MachineFunction &MF) override { + bool runOnMachineFunction(MachineFunction &MF) override { std::string Str; raw_string_ostream StrOS(Str); printMIR(StrOS, MF); @@ -48,7 +48,7 @@ struct MIRPrintingPass : public MachineFunctionPass { return false; } - virtual bool doFinalization(Module &M) override { + bool doFinalization(Module &M) override { printMIR(OS, M); OS << MachineFunctions; return false; diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.h b/lib/ExecutionEngine/MCJIT/MCJIT.h index a45173c2da8..f27aa39f2d5 100644 --- a/lib/ExecutionEngine/MCJIT/MCJIT.h +++ b/lib/ExecutionEngine/MCJIT/MCJIT.h @@ -223,12 +223,13 @@ public: /// FindFunctionNamed - Search all of the active modules to find the function that /// defines FnName. This is very slow operation and shouldn't be used for /// general code. - virtual Function *FindFunctionNamed(const char *FnName) override; + Function *FindFunctionNamed(const char *FnName) override; - /// FindGlobalVariableNamed - Search all of the active modules to find the global variable - /// that defines Name. This is very slow operation and shouldn't be used for - /// general code. - virtual GlobalVariable *FindGlobalVariableNamed(const char *Name, bool AllowInternal = false) override; + /// FindGlobalVariableNamed - Search all of the active modules to find the + /// global variable that defines Name. This is very slow operation and + /// shouldn't be used for general code. + GlobalVariable *FindGlobalVariableNamed(const char *Name, + bool AllowInternal = false) override; /// Sets the object manager that MCJIT should use to avoid compilation. void setObjectCache(ObjectCache *manager) override; @@ -335,6 +336,6 @@ protected: bool CheckFunctionsOnly); }; -} // End llvm namespace +} // end llvm namespace -#endif +#endif // LLVM_LIB_EXECUTIONENGINE_MCJIT_MCJIT_H diff --git a/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp b/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp index 9eee4a0f3d8..740553eb6aa 100644 --- a/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp +++ b/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp @@ -185,14 +185,14 @@ public: X86AddressSanitizer(const MCSubtargetInfo &STI) : X86AsmInstrumentation(STI), RepPrefix(false), OrigSPOffset(0) {} - virtual ~X86AddressSanitizer() {} + ~X86AddressSanitizer() override = default; // X86AsmInstrumentation implementation: - virtual void InstrumentAndEmitInstruction(const MCInst &Inst, - OperandVector &Operands, - MCContext &Ctx, - const MCInstrInfo &MII, - MCStreamer &Out) override { + void InstrumentAndEmitInstruction(const MCInst &Inst, + OperandVector &Operands, + MCContext &Ctx, + const MCInstrInfo &MII, + MCStreamer &Out) override { InstrumentMOVS(Inst, Operands, Ctx, MII, Out); if (RepPrefix) EmitInstruction(Out, MCInstBuilder(X86::REP_PREFIX)); @@ -506,7 +506,7 @@ public: X86AddressSanitizer32(const MCSubtargetInfo &STI) : X86AddressSanitizer(STI) {} - virtual ~X86AddressSanitizer32() {} + ~X86AddressSanitizer32() override = default; unsigned GetFrameReg(const MCContext &Ctx, MCStreamer &Out) { unsigned FrameReg = GetFrameRegGeneric(Ctx, Out); @@ -535,9 +535,9 @@ public: OrigSPOffset += 4; } - virtual void InstrumentMemOperandPrologue(const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override { + void InstrumentMemOperandPrologue(const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override { unsigned LocalFrameReg = RegCtx.ChooseFrameReg(MVT::i32); assert(LocalFrameReg != X86::NoRegister); @@ -565,9 +565,9 @@ public: StoreFlags(Out); } - virtual void InstrumentMemOperandEpilogue(const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override { + void InstrumentMemOperandEpilogue(const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override { unsigned LocalFrameReg = RegCtx.ChooseFrameReg(MVT::i32); assert(LocalFrameReg != X86::NoRegister); @@ -586,18 +586,18 @@ public: } } - virtual void InstrumentMemOperandSmall(X86Operand &Op, unsigned AccessSize, - bool IsWrite, - const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override; - virtual void InstrumentMemOperandLarge(X86Operand &Op, unsigned AccessSize, - bool IsWrite, - const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override; - virtual void InstrumentMOVSImpl(unsigned AccessSize, MCContext &Ctx, - MCStreamer &Out) override; + void InstrumentMemOperandSmall(X86Operand &Op, unsigned AccessSize, + bool IsWrite, + const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override; + void InstrumentMemOperandLarge(X86Operand &Op, unsigned AccessSize, + bool IsWrite, + const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override; + void InstrumentMOVSImpl(unsigned AccessSize, MCContext &Ctx, + MCStreamer &Out) override; private: void EmitCallAsanReport(unsigned AccessSize, bool IsWrite, MCContext &Ctx, @@ -763,7 +763,7 @@ public: X86AddressSanitizer64(const MCSubtargetInfo &STI) : X86AddressSanitizer(STI) {} - virtual ~X86AddressSanitizer64() {} + ~X86AddressSanitizer64() override = default; unsigned GetFrameReg(const MCContext &Ctx, MCStreamer &Out) { unsigned FrameReg = GetFrameRegGeneric(Ctx, Out); @@ -792,9 +792,9 @@ public: OrigSPOffset += 8; } - virtual void InstrumentMemOperandPrologue(const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override { + void InstrumentMemOperandPrologue(const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override { unsigned LocalFrameReg = RegCtx.ChooseFrameReg(MVT::i64); assert(LocalFrameReg != X86::NoRegister); @@ -823,9 +823,9 @@ public: StoreFlags(Out); } - virtual void InstrumentMemOperandEpilogue(const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override { + void InstrumentMemOperandEpilogue(const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override { unsigned LocalFrameReg = RegCtx.ChooseFrameReg(MVT::i64); assert(LocalFrameReg != X86::NoRegister); @@ -845,18 +845,18 @@ public: } } - virtual void InstrumentMemOperandSmall(X86Operand &Op, unsigned AccessSize, - bool IsWrite, - const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override; - virtual void InstrumentMemOperandLarge(X86Operand &Op, unsigned AccessSize, - bool IsWrite, - const RegisterContext &RegCtx, - MCContext &Ctx, - MCStreamer &Out) override; - virtual void InstrumentMOVSImpl(unsigned AccessSize, MCContext &Ctx, - MCStreamer &Out) override; + void InstrumentMemOperandSmall(X86Operand &Op, unsigned AccessSize, + bool IsWrite, + const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override; + void InstrumentMemOperandLarge(X86Operand &Op, unsigned AccessSize, + bool IsWrite, + const RegisterContext &RegCtx, + MCContext &Ctx, + MCStreamer &Out) override; + void InstrumentMOVSImpl(unsigned AccessSize, MCContext &Ctx, + MCStreamer &Out) override; private: void EmitAdjustRSP(MCContext &Ctx, MCStreamer &Out, long Offset) { @@ -1080,4 +1080,4 @@ CreateX86AsmInstrumentation(const MCTargetOptions &MCOptions, return new X86AsmInstrumentation(STI); } -} // End llvm namespace +} // end llvm namespace diff --git a/lib/Transforms/Instrumentation/SafeStack.cpp b/lib/Transforms/Instrumentation/SafeStack.cpp index 0ea61e439c5..cf68653afc6 100644 --- a/lib/Transforms/Instrumentation/SafeStack.cpp +++ b/lib/Transforms/Instrumentation/SafeStack.cpp @@ -220,11 +220,11 @@ public: initializeSafeStackPass(*PassRegistry::getPassRegistry()); } - virtual void getAnalysisUsage(AnalysisUsage &AU) const { + void getAnalysisUsage(AnalysisUsage &AU) const override { AU.addRequired(); } - virtual bool doInitialization(Module &M) { + bool doInitialization(Module &M) override { DL = &M.getDataLayout(); StackPtrTy = Type::getInt8PtrTy(M.getContext()); @@ -235,8 +235,7 @@ public: return false; } - bool runOnFunction(Function &F); - + bool runOnFunction(Function &F) override; }; // class SafeStack Constant *SafeStack::getOrCreateUnsafeStackPtr(Module &M) { diff --git a/utils/TableGen/InstrInfoEmitter.cpp b/utils/TableGen/InstrInfoEmitter.cpp index e242a965ff9..eda4073c6c6 100644 --- a/utils/TableGen/InstrInfoEmitter.cpp +++ b/utils/TableGen/InstrInfoEmitter.cpp @@ -1,4 +1,4 @@ -//===- InstrInfoEmitter.cpp - Generate a Instruction Set Desc. ------------===// +//===- InstrInfoEmitter.cpp - Generate a Instruction Set Desc. --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// - #include "CodeGenDAGPatterns.h" #include "CodeGenSchedule.h" #include "CodeGenTarget.h" @@ -26,6 +25,7 @@ #include #include #include + using namespace llvm; namespace { @@ -70,7 +70,7 @@ private: void EmitOperandInfo(raw_ostream &OS, OperandInfoMapTy &OperandInfoIDs); std::vector GetOperandInfo(const CodeGenInstruction &Inst); }; -} // End anonymous namespace +} // end anonymous namespace static void PrintDefList(const std::vector &Uses, unsigned Num, raw_ostream &OS) { @@ -190,7 +190,6 @@ void InstrInfoEmitter::EmitOperandInfo(raw_ostream &OS, } } - /// Initialize data structures for generating operand name mappings. /// /// \param Operands [out] A map used to generate the OpName enum with operand @@ -257,9 +256,9 @@ void InstrInfoEmitter::emitOperandNameMappings(raw_ostream &OS, OS << "OPERAND_LAST"; OS << "\n};\n"; - OS << "} // End namespace OpName\n"; - OS << "} // End namespace " << Namespace << "\n"; - OS << "} // End namespace llvm\n"; + OS << "} // end namespace OpName\n"; + OS << "} // end namespace " << Namespace << "\n"; + OS << "} // end namespace llvm\n"; OS << "#endif //GET_INSTRINFO_OPERAND_ENUM\n"; OS << "#ifdef GET_INSTRINFO_NAMED_OPS\n"; @@ -298,8 +297,8 @@ void InstrInfoEmitter::emitOperandNameMappings(raw_ostream &OS, OS << " return -1;\n"; } OS << "}\n"; - OS << "} // End namespace " << Namespace << "\n"; - OS << "} // End namespace llvm\n"; + OS << "} // end namespace " << Namespace << "\n"; + OS << "} // end namespace llvm\n"; OS << "#endif //GET_INSTRINFO_NAMED_OPS\n"; } @@ -328,9 +327,9 @@ void InstrInfoEmitter::emitOperandTypesEnum(raw_ostream &OS, } OS << " OPERAND_TYPE_LIST_END" << "\n};\n"; - OS << "} // End namespace OpTypes\n"; - OS << "} // End namespace " << Namespace << "\n"; - OS << "} // End namespace llvm\n"; + OS << "} // end namespace OpTypes\n"; + OS << "} // end namespace " << Namespace << "\n"; + OS << "} // end namespace llvm\n"; OS << "#endif // GET_INSTRINFO_OPERAND_TYPES_ENUM\n"; } @@ -419,7 +418,7 @@ void InstrInfoEmitter::run(raw_ostream &OS) { << TargetName << "InstrNameIndices, " << TargetName << "InstrNameData, " << NumberedInstructions.size() << ");\n}\n\n"; - OS << "} // End llvm namespace \n"; + OS << "} // end llvm namespace \n"; OS << "#endif // GET_INSTRINFO_MC_DESC\n\n"; @@ -432,9 +431,9 @@ void InstrInfoEmitter::run(raw_ostream &OS) { OS << "struct " << ClassName << " : public TargetInstrInfo {\n" << " explicit " << ClassName << "(int CFSetupOpcode = -1, int CFDestroyOpcode = -1);\n" - << " virtual ~" << ClassName << "();\n" + << " ~" << ClassName << "() override = default;\n" << "};\n"; - OS << "} // End llvm namespace \n"; + OS << "} // end llvm namespace \n"; OS << "#endif // GET_INSTRINFO_HEADER\n\n"; @@ -450,9 +449,8 @@ void InstrInfoEmitter::run(raw_ostream &OS) { << " : TargetInstrInfo(CFSetupOpcode, CFDestroyOpcode) {\n" << " InitMCInstrInfo(" << TargetName << "Insts, " << TargetName << "InstrNameIndices, " << TargetName << "InstrNameData, " - << NumberedInstructions.size() << ");\n}\n" - << ClassName << "::~" << ClassName << "() {}\n"; - OS << "} // End llvm namespace \n"; + << NumberedInstructions.size() << ");\n}\n"; + OS << "} // end llvm namespace \n"; OS << "#endif // GET_INSTRINFO_CTOR_DTOR\n\n"; @@ -596,9 +594,9 @@ void InstrInfoEmitter::emitEnums(raw_ostream &OS) { OS << " " << Class.Name << "\t= " << Num++ << ",\n"; OS << " SCHED_LIST_END = " << SchedModels.numInstrSchedClasses() << "\n"; OS << " };\n"; - OS << "} // End Sched namespace\n"; - OS << "} // End " << Namespace << " namespace\n"; - OS << "} // End llvm namespace \n"; + OS << "} // end Sched namespace\n"; + OS << "} // end " << Namespace << " namespace\n"; + OS << "} // end llvm namespace \n"; OS << "#endif // GET_INSTRINFO_ENUM\n\n"; } @@ -610,4 +608,4 @@ void EmitInstrInfo(RecordKeeper &RK, raw_ostream &OS) { EmitMapTable(RK, OS); } -} // End llvm namespace +} // end llvm namespace