Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 85bba31

Browse files
topperctopperc
committed
[C++11] Add 'override' keyword to virtual methods that override their base class.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203758 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 371de80 commit 85bba31

28 files changed

+383
-403
lines changed

Diff for: ‎include/clang/Driver/Job.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class Command : public Job {
7676
Command(const Action &_Source, const Tool &_Creator, const char *_Executable,
7777
const llvm::opt::ArgStringList &_Arguments);
7878

79-
virtual void Print(llvm::raw_ostream &OS, const char *Terminator,
80-
bool Quote, bool CrashReport = false) const;
79+
void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote,
80+
bool CrashReport = false) const override;
8181

8282
virtual int Execute(const StringRef **Redirects, std::string *ErrMsg,
8383
bool *ExecutionFailed) const;
@@ -106,11 +106,11 @@ class FallbackCommand : public Command {
106106
const char *Executable_, const ArgStringList &Arguments_,
107107
Command *Fallback_);
108108

109-
virtual void Print(llvm::raw_ostream &OS, const char *Terminator,
110-
bool Quote, bool CrashReport = false) const;
109+
void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote,
110+
bool CrashReport = false) const override;
111111

112-
virtual int Execute(const StringRef **Redirects, std::string *ErrMsg,
113-
bool *ExecutionFailed) const;
112+
int Execute(const StringRef **Redirects, std::string *ErrMsg,
113+
bool *ExecutionFailed) const override;
114114

115115
static bool classof(const Job *J) {
116116
return J->getKind() == FallbackCommandClass;
@@ -135,8 +135,8 @@ class JobList : public Job {
135135
JobList();
136136
virtual ~JobList();
137137

138-
virtual void Print(llvm::raw_ostream &OS, const char *Terminator,
139-
bool Quote, bool CrashReport = false) const;
138+
void Print(llvm::raw_ostream &OS, const char *Terminator,
139+
bool Quote, bool CrashReport = false) const override;
140140

141141
/// Add a job to the list (taking ownership).
142142
void addJob(Job *J) { Jobs.push_back(J); }

Diff for: ‎include/clang/Frontend/ASTUnit.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -858,19 +858,16 @@ class ASTUnit : public ModuleLoader {
858858
///
859859
/// \returns True if an error occurred, false otherwise.
860860
bool serialize(raw_ostream &OS);
861-
862-
virtual ModuleLoadResult loadModule(SourceLocation ImportLoc,
863-
ModuleIdPath Path,
864-
Module::NameVisibilityKind Visibility,
865-
bool IsInclusionDirective) {
861+
862+
ModuleLoadResult loadModule(SourceLocation ImportLoc, ModuleIdPath Path,
863+
Module::NameVisibilityKind Visibility,
864+
bool IsInclusionDirective) override {
866865
// ASTUnit doesn't know how to load modules (not that this matters).
867866
return ModuleLoadResult();
868867
}
869868

870-
virtual void makeModuleVisible(Module *Mod,
871-
Module::NameVisibilityKind Visibility,
872-
SourceLocation ImportLoc,
873-
bool Complain) { }
869+
void makeModuleVisible(Module *Mod, Module::NameVisibilityKind Visibility,
870+
SourceLocation ImportLoc, bool Complain) override {}
874871

875872
};
876873

Diff for: ‎include/clang/Frontend/ChainedDiagnosticConsumer.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@ class ChainedDiagnosticConsumer : public DiagnosticConsumer {
3232
Secondary.reset(_Secondary);
3333
}
3434

35-
virtual void BeginSourceFile(const LangOptions &LO,
36-
const Preprocessor *PP) {
35+
void BeginSourceFile(const LangOptions &LO,
36+
const Preprocessor *PP) override {
3737
Primary->BeginSourceFile(LO, PP);
3838
Secondary->BeginSourceFile(LO, PP);
3939
}
4040

41-
virtual void EndSourceFile() {
41+
void EndSourceFile() override {
4242
Secondary->EndSourceFile();
4343
Primary->EndSourceFile();
4444
}
4545

46-
virtual void finish() {
46+
void finish() override {
4747
Secondary->finish();
4848
Primary->finish();
4949
}
5050

51-
virtual bool IncludeInDiagnosticCounts() const {
51+
bool IncludeInDiagnosticCounts() const override {
5252
return Primary->IncludeInDiagnosticCounts();
5353
}
5454

55-
virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
56-
const Diagnostic &Info) {
55+
void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
56+
const Diagnostic &Info) override {
5757
// Default implementation (Warnings/errors count).
5858
DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
5959

Diff for: ‎include/clang/Frontend/ChainedIncludesSource.h

+21-21
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,35 @@ class ChainedIncludesSource : public ExternalSemaSource {
3939
// ExternalASTSource interface.
4040
//===----------------------------------------------------------------------===//
4141

42-
virtual Decl *GetExternalDecl(uint32_t ID);
43-
virtual Selector GetExternalSelector(uint32_t ID);
44-
virtual uint32_t GetNumExternalSelectors();
45-
virtual Stmt *GetExternalDeclStmt(uint64_t Offset);
46-
virtual CXXBaseSpecifier *GetExternalCXXBaseSpecifiers(uint64_t Offset);
47-
virtual bool FindExternalVisibleDeclsByName(const DeclContext *DC,
48-
DeclarationName Name);
49-
virtual ExternalLoadResult FindExternalLexicalDecls(const DeclContext *DC,
50-
bool (*isKindWeWant)(Decl::Kind),
51-
SmallVectorImpl<Decl*> &Result);
52-
virtual void CompleteType(TagDecl *Tag);
53-
virtual void CompleteType(ObjCInterfaceDecl *Class);
54-
virtual void StartedDeserializing();
55-
virtual void FinishedDeserializing();
56-
virtual void StartTranslationUnit(ASTConsumer *Consumer);
57-
virtual void PrintStats();
42+
Decl *GetExternalDecl(uint32_t ID) override;
43+
Selector GetExternalSelector(uint32_t ID) override;
44+
uint32_t GetNumExternalSelectors() override;
45+
Stmt *GetExternalDeclStmt(uint64_t Offset) override;
46+
CXXBaseSpecifier *GetExternalCXXBaseSpecifiers(uint64_t Offset) override;
47+
bool FindExternalVisibleDeclsByName(const DeclContext *DC,
48+
DeclarationName Name) override;
49+
ExternalLoadResult FindExternalLexicalDecls(const DeclContext *DC,
50+
bool (*isKindWeWant)(Decl::Kind),
51+
SmallVectorImpl<Decl*> &Result) override;
52+
void CompleteType(TagDecl *Tag) override;
53+
void CompleteType(ObjCInterfaceDecl *Class) override;
54+
void StartedDeserializing() override;
55+
void FinishedDeserializing() override;
56+
void StartTranslationUnit(ASTConsumer *Consumer) override;
57+
void PrintStats() override;
5858

5959
/// Return the amount of memory used by memory buffers, breaking down
6060
/// by heap-backed versus mmap'ed memory.
61-
virtual void getMemoryBufferSizes(MemoryBufferSizes &sizes) const;
61+
void getMemoryBufferSizes(MemoryBufferSizes &sizes) const override;
6262

6363
//===----------------------------------------------------------------------===//
6464
// ExternalSemaSource interface.
6565
//===----------------------------------------------------------------------===//
6666

67-
virtual void InitializeSema(Sema &S);
68-
virtual void ForgetSema();
69-
virtual void ReadMethodPool(Selector Sel);
70-
virtual bool LookupUnqualified(LookupResult &R, Scope *S);
67+
void InitializeSema(Sema &S) override;
68+
void ForgetSema() override;
69+
void ReadMethodPool(Selector Sel) override;
70+
bool LookupUnqualified(LookupResult &R, Scope *S) override;
7171
};
7272

7373
}

Diff for: ‎include/clang/Frontend/CompilerInstance.h

+7-10
Original file line numberDiff line numberDiff line change
@@ -682,16 +682,13 @@ class CompilerInstance : public ModuleLoader {
682682
const FrontendOptions &Opts);
683683

684684
/// }
685-
686-
virtual ModuleLoadResult loadModule(SourceLocation ImportLoc,
687-
ModuleIdPath Path,
688-
Module::NameVisibilityKind Visibility,
689-
bool IsInclusionDirective);
690-
691-
virtual void makeModuleVisible(Module *Mod,
692-
Module::NameVisibilityKind Visibility,
693-
SourceLocation ImportLoc,
694-
bool Complain);
685+
686+
ModuleLoadResult loadModule(SourceLocation ImportLoc, ModuleIdPath Path,
687+
Module::NameVisibilityKind Visibility,
688+
bool IsInclusionDirective) override;
689+
690+
void makeModuleVisible(Module *Mod, Module::NameVisibilityKind Visibility,
691+
SourceLocation ImportLoc, bool Complain) override;
695692

696693
bool hadModuleLoaderFatalFailure() const {
697694
return ModuleLoader::HadFatalFailure;

Diff for: ‎include/clang/Frontend/DiagnosticRenderer.h

+11-12
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,19 @@ class DiagnosticNoteRenderer : public DiagnosticRenderer {
158158
: DiagnosticRenderer(LangOpts, DiagOpts) {}
159159

160160
virtual ~DiagnosticNoteRenderer();
161-
162-
virtual void emitBasicNote(StringRef Message);
163-
164-
virtual void emitIncludeLocation(SourceLocation Loc,
165-
PresumedLoc PLoc,
166-
const SourceManager &SM);
167161

168-
virtual void emitImportLocation(SourceLocation Loc, PresumedLoc PLoc,
169-
StringRef ModuleName,
170-
const SourceManager &SM);
162+
void emitBasicNote(StringRef Message) override;
171163

172-
virtual void emitBuildingModuleLocation(SourceLocation Loc, PresumedLoc PLoc,
173-
StringRef ModuleName,
174-
const SourceManager &SM);
164+
void emitIncludeLocation(SourceLocation Loc, PresumedLoc PLoc,
165+
const SourceManager &SM) override;
166+
167+
void emitImportLocation(SourceLocation Loc, PresumedLoc PLoc,
168+
StringRef ModuleName,
169+
const SourceManager &SM) override;
170+
171+
void emitBuildingModuleLocation(SourceLocation Loc, PresumedLoc PLoc,
172+
StringRef ModuleName,
173+
const SourceManager &SM) override;
175174

176175
virtual void emitNote(SourceLocation Loc, StringRef Message,
177176
const SourceManager *SM) = 0;

Diff for: ‎include/clang/Frontend/FrontendAction.h

+19-20
Original file line numberDiff line numberDiff line change
@@ -218,17 +218,17 @@ class ASTFrontendAction : public FrontendAction {
218218
///
219219
/// This will also take care of instantiating a code completion consumer if
220220
/// the user requested it and the action supports it.
221-
virtual void ExecuteAction();
221+
void ExecuteAction() override;
222222

223223
public:
224-
virtual bool usesPreprocessorOnly() const { return false; }
224+
bool usesPreprocessorOnly() const override { return false; }
225225
};
226226

227227
class PluginASTAction : public ASTFrontendAction {
228228
virtual void anchor();
229229
protected:
230-
virtual ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
231-
StringRef InFile) = 0;
230+
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
231+
StringRef InFile) override = 0;
232232

233233
public:
234234
/// \brief Parse the given plugin command line arguments.
@@ -246,11 +246,11 @@ class PreprocessorFrontendAction : public FrontendAction {
246246
protected:
247247
/// \brief Provide a default implementation which returns aborts;
248248
/// this method should never be called by FrontendAction clients.
249-
virtual ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
250-
StringRef InFile);
249+
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
250+
StringRef InFile) override;
251251

252252
public:
253-
virtual bool usesPreprocessorOnly() const { return true; }
253+
bool usesPreprocessorOnly() const override { return true; }
254254
};
255255

256256
/// \brief A frontend action which simply wraps some other runtime-specified
@@ -263,25 +263,24 @@ class WrapperFrontendAction : public FrontendAction {
263263
std::unique_ptr<FrontendAction> WrappedAction;
264264

265265
protected:
266-
virtual ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
267-
StringRef InFile);
268-
virtual bool BeginInvocation(CompilerInstance &CI);
269-
virtual bool BeginSourceFileAction(CompilerInstance &CI,
270-
StringRef Filename);
271-
virtual void ExecuteAction();
272-
virtual void EndSourceFileAction();
266+
ASTConsumer *CreateASTConsumer(CompilerInstance &CI,
267+
StringRef InFile) override;
268+
bool BeginInvocation(CompilerInstance &CI) override;
269+
bool BeginSourceFileAction(CompilerInstance &CI, StringRef Filename) override;
270+
void ExecuteAction() override;
271+
void EndSourceFileAction() override;
273272

274273
public:
275274
/// Construct a WrapperFrontendAction from an existing action, taking
276275
/// ownership of it.
277276
WrapperFrontendAction(FrontendAction *WrappedAction);
278277

279-
virtual bool usesPreprocessorOnly() const;
280-
virtual TranslationUnitKind getTranslationUnitKind();
281-
virtual bool hasPCHSupport() const;
282-
virtual bool hasASTFileSupport() const;
283-
virtual bool hasIRSupport() const;
284-
virtual bool hasCodeCompletionSupport() const;
278+
bool usesPreprocessorOnly() const override;
279+
TranslationUnitKind getTranslationUnitKind() override;
280+
bool hasPCHSupport() const override;
281+
bool hasASTFileSupport() const override;
282+
bool hasIRSupport() const override;
283+
bool hasCodeCompletionSupport() const override;
285284
};
286285

287286
} // end namespace clang

0 commit comments

Comments
 (0)