Author: Logan Smith Date: 2020-07-14T08:59:57-07:00 New Revision: 2c2a297bb6d1ce9752a69c8c18a58eacc6d3f961
URL: https://github.com/llvm/llvm-project/commit/2c2a297bb6d1ce9752a69c8c18a58eacc6d3f961 DIFF: https://github.com/llvm/llvm-project/commit/2c2a297bb6d1ce9752a69c8c18a58eacc6d3f961.diff LOG: [clang][NFC] Add 'override' keyword to virtual function overrides This patch adds override to several overriding virtual functions that were missing the keyword within the clang/ directory. These were found by the new -Wsuggest-override. Added: Modified: clang/include/clang/AST/DeclOpenMP.h clang/lib/AST/Interp/InterpFrame.h clang/lib/AST/OSLog.cpp clang/lib/Basic/Targets/OSTargets.h clang/lib/Sema/SemaDeclCXX.cpp clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp Removed: ################################################################################ diff --git a/clang/include/clang/AST/DeclOpenMP.h b/clang/include/clang/AST/DeclOpenMP.h index 437feaba28fb..154ecb977692 100644 --- a/clang/include/clang/AST/DeclOpenMP.h +++ b/clang/include/clang/AST/DeclOpenMP.h @@ -129,7 +129,7 @@ class OMPDeclareReductionDecl final : public ValueDecl, public DeclContext { /// the declare reduction construct is declared inside compound statement. LazyDeclPtr PrevDeclInScope; - virtual void anchor(); + void anchor() override; OMPDeclareReductionDecl(Kind DK, DeclContext *DC, SourceLocation L, DeclarationName Name, QualType Ty, @@ -228,7 +228,7 @@ class OMPDeclareMapperDecl final : public ValueDecl, public DeclContext { LazyDeclPtr PrevDeclInScope; - virtual void anchor(); + void anchor() override; OMPDeclareMapperDecl(Kind DK, DeclContext *DC, SourceLocation L, DeclarationName Name, QualType Ty, diff --git a/clang/lib/AST/Interp/InterpFrame.h b/clang/lib/AST/Interp/InterpFrame.h index b8391b0bcf92..304e2ad66537 100644 --- a/clang/lib/AST/Interp/InterpFrame.h +++ b/clang/lib/AST/Interp/InterpFrame.h @@ -45,16 +45,16 @@ class InterpFrame final : public Frame { void popArgs(); /// Describes the frame with arguments for diagnostic purposes. - void describe(llvm::raw_ostream &OS); + void describe(llvm::raw_ostream &OS) override; /// Returns the parent frame object. - Frame *getCaller() const; + Frame *getCaller() const override; /// Returns the location of the call to the frame. - SourceLocation getCallLocation() const; + SourceLocation getCallLocation() const override; /// Returns the caller. - const FunctionDecl *getCallee() const; + const FunctionDecl *getCallee() const override; /// Returns the current function. Function *getFunction() const { return Func; } diff --git a/clang/lib/AST/OSLog.cpp b/clang/lib/AST/OSLog.cpp index df2f808728cf..094c0102854b 100644 --- a/clang/lib/AST/OSLog.cpp +++ b/clang/lib/AST/OSLog.cpp @@ -55,9 +55,9 @@ class OSLogFormatStringHandler ArgsData.reserve(Args.size()); } - virtual bool HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier &FS, - const char *StartSpecifier, - unsigned SpecifierLen) { + bool HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier &FS, + const char *StartSpecifier, + unsigned SpecifierLen) override { if (!FS.consumesDataArgument() && FS.getConversionSpecifier().getKind() != clang::analyze_format_string::ConversionSpecifier::PrintErrno) diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index af04b75392f5..cfa362bef1b1 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -821,7 +821,7 @@ class LLVM_LIBRARY_VISIBILITY WebAssemblyOSTargetInfo : public OSTargetInfo<Target> { protected: void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple, - MacroBuilder &Builder) const { + MacroBuilder &Builder) const override { // A common platform macro. if (Opts.POSIXThreads) Builder.defineMacro("_REENTRANT"); diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 515a2e9690ed..22bf35dbd0cb 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -1066,7 +1066,7 @@ static IsTupleLike isTupleLike(Sema &S, SourceLocation Loc, QualType T, TemplateArgumentListInfo &Args; ICEDiagnoser(LookupResult &R, TemplateArgumentListInfo &Args) : R(R), Args(Args) {} - void diagnoseNotICE(Sema &S, SourceLocation Loc, SourceRange SR) { + void diagnoseNotICE(Sema &S, SourceLocation Loc, SourceRange SR) override { S.Diag(Loc, diag::err_decomp_decl_std_tuple_size_not_constant) << printTemplateArgs(S.Context.getPrintingPolicy(), Args); } diff --git a/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp index 43f7dcd14b01..87477e96d2d1 100644 --- a/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp @@ -66,7 +66,7 @@ class MacOSKeychainAPIChecker : public Checker<check::PreStmt<CallExpr>, ProgramStateRef evalAssume(ProgramStateRef state, SVal Cond, bool Assumption) const; void printState(raw_ostream &Out, ProgramStateRef State, - const char *NL, const char *Sep) const; + const char *NL, const char *Sep) const override; private: typedef std::pair<SymbolRef, const AllocationState*> AllocationPair; diff --git a/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp index abeca596d056..df01cc760e7e 100644 --- a/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp @@ -57,7 +57,7 @@ class Callback : public MatchFinder::MatchCallback { Callback(const NumberObjectConversionChecker *C, BugReporter &BR, AnalysisDeclContext *ADC) : C(C), BR(BR), ADC(ADC) {} - virtual void run(const MatchFinder::MatchResult &Result); + void run(const MatchFinder::MatchResult &Result) override; }; } // end of anonymous namespace diff --git a/clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp index ff19d7a2b9d4..8c2008a7ceb4 100644 --- a/clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp @@ -58,7 +58,7 @@ class ObjCContainersChecker : public Checker< check::PreStmt<CallExpr>, PointerEscapeKind Kind) const; void printState(raw_ostream &OS, ProgramStateRef State, - const char *NL, const char *Sep) const; + const char *NL, const char *Sep) const override; }; } // end anonymous namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits