[C++11] Add 'override' keyword to virtual methods that override their base class.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202946 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2014-03-05 07:52:44 +00:00
parent c37e6c0734
commit 01394fb9e4
11 changed files with 62 additions and 61 deletions

View File

@ -209,7 +209,7 @@ class ValueMapCallbackVH : public CallbackVH {
public:
KeyT Unwrap() const { return cast_or_null<KeySansPointerT>(getValPtr()); }
virtual void deleted() {
void deleted() override {
// Make a copy that won't get changed even when *this is destroyed.
ValueMapCallbackVH Copy(*this);
sys::Mutex *M = Config::getMutex(Copy.Map->Data);
@ -220,7 +220,7 @@ public:
if (M)
M->release();
}
virtual void allUsesReplacedWith(Value *new_key) {
void allUsesReplacedWith(Value *new_key) override {
assert(isa<KeySansPointerT>(new_key) &&
"Invalid RAUW on key of ValueMap<>");
// Make a copy that won't get changed even when *this is destroyed.

View File

@ -120,7 +120,7 @@ private:
struct ListCompleterConcept : CompleterConcept {
~ListCompleterConcept();
CompletionAction complete(StringRef Buffer, size_t Pos) const;
CompletionAction complete(StringRef Buffer, size_t Pos) const override;
static std::string getCommonPrefix(const std::vector<Completion> &Comps);
virtual std::vector<Completion> getCompletions(StringRef Buffer,
size_t Pos) const = 0;
@ -129,7 +129,7 @@ private:
template <typename T>
struct CompleterModel : CompleterConcept {
CompleterModel(T Value) : Value(Value) {}
CompletionAction complete(StringRef Buffer, size_t Pos) const {
CompletionAction complete(StringRef Buffer, size_t Pos) const override {
return Value(Buffer, Pos);
}
T Value;
@ -138,7 +138,8 @@ private:
template <typename T>
struct ListCompleterModel : ListCompleterConcept {
ListCompleterModel(T Value) : Value(Value) {}
std::vector<Completion> getCompletions(StringRef Buffer, size_t Pos) const {
std::vector<Completion> getCompletions(StringRef Buffer,
size_t Pos) const override {
return Value(Buffer, Pos);
}
T Value;

View File

@ -67,7 +67,7 @@ protected:
SymbolRef::Type &Res) const override;
error_code getSymbolSection(DataRefImpl Symb,
section_iterator &Res) const override;
error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const;
error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const override;
error_code getLibraryNext(DataRefImpl Data,
LibraryRef &Result) const override;
@ -77,19 +77,19 @@ protected:
error_code getSectionName(DataRefImpl Sec, StringRef &Res) const override;
error_code getSectionAddress(DataRefImpl Sec, uint64_t &Res) const override;
error_code getSectionSize(DataRefImpl Sec, uint64_t &Res) const override;
error_code getSectionContents(DataRefImpl Sec, StringRef &Res) const;
error_code getSectionContents(DataRefImpl Sec, StringRef &Res) const override;
error_code getSectionAlignment(DataRefImpl Sec, uint64_t &Res) const override;
error_code isSectionText(DataRefImpl Sec, bool &Res) const override;
error_code isSectionData(DataRefImpl Sec, bool &Res) const;
error_code isSectionData(DataRefImpl Sec, bool &Res) const override;
error_code isSectionBSS(DataRefImpl Sec, bool &Res) const override;
error_code isSectionRequiredForExecution(DataRefImpl Sec,
bool &Res) const override;
error_code isSectionVirtual(DataRefImpl Sec, bool &Res) const;
error_code isSectionVirtual(DataRefImpl Sec, bool &Res) const override;
error_code isSectionZeroInit(DataRefImpl Sec, bool &Res) const override;
error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const;
error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const override;
error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
bool &Result) const override;
relocation_iterator section_rel_begin(DataRefImpl Sec) const;
relocation_iterator section_rel_begin(DataRefImpl Sec) const override;
relocation_iterator section_rel_end(DataRefImpl Sec) const override;
section_iterator getRelocatedSection(DataRefImpl Sec) const override;
@ -98,7 +98,7 @@ protected:
uint64_t &Res) const override;
error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const override;
symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override;
error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const;
error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const override;
error_code getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const override;
error_code getRelocationValueString(DataRefImpl Rel,

View File

@ -223,7 +223,7 @@ protected:
// modified externally. It's UB otherwise.
friend class SymbolRef;
virtual error_code getSymbolName(DataRefImpl Symb, StringRef &Res) const = 0;
virtual error_code printSymbolName(raw_ostream &OS, DataRefImpl Symb) const;
error_code printSymbolName(raw_ostream &OS, DataRefImpl Symb) const override;
virtual error_code getSymbolAddress(DataRefImpl Symb, uint64_t &Res) const = 0;
virtual error_code getSymbolFileOffset(DataRefImpl Symb, uint64_t &Res)const=0;
virtual error_code getSymbolAlignment(DataRefImpl Symb, uint32_t &Res) const;

View File

@ -307,11 +307,11 @@ public:
InputArgList(const char* const *ArgBegin, const char* const *ArgEnd);
~InputArgList();
virtual const char *getArgString(unsigned Index) const {
const char *getArgString(unsigned Index) const override {
return ArgStrings[Index];
}
virtual unsigned getNumInputArgStrings() const {
unsigned getNumInputArgStrings() const override {
return NumInputArgStrings;
}
@ -323,7 +323,7 @@ public:
unsigned MakeIndex(StringRef String0) const;
unsigned MakeIndex(StringRef String0, StringRef String1) const;
virtual const char *MakeArgString(StringRef Str) const;
const char *MakeArgString(StringRef Str) const override;
/// @}
};
@ -341,11 +341,11 @@ public:
DerivedArgList(const InputArgList &BaseArgs);
~DerivedArgList();
virtual const char *getArgString(unsigned Index) const {
const char *getArgString(unsigned Index) const override {
return BaseArgs.getArgString(Index);
}
virtual unsigned getNumInputArgStrings() const {
unsigned getNumInputArgStrings() const override {
return BaseArgs.getNumInputArgStrings();
}
@ -362,7 +362,7 @@ public:
SynthesizedArgs.push_back(A);
}
virtual const char *MakeArgString(StringRef Str) const;
const char *MakeArgString(StringRef Str) const override;
/// AddFlagArg - Construct a new FlagArg for the given option \p Id and
/// append it to the argument list.

View File

@ -247,11 +247,11 @@ public:
/// when the reader is destroyed.
void setBufferOwned(bool Owned) { BufferOwned = Owned; }
virtual bool isMaterializable(const GlobalValue *GV) const;
virtual bool isDematerializable(const GlobalValue *GV) const;
virtual error_code Materialize(GlobalValue *GV);
virtual error_code MaterializeModule(Module *M);
virtual void Dematerialize(GlobalValue *GV);
bool isMaterializable(const GlobalValue *GV) const override;
bool isDematerializable(const GlobalValue *GV) const override;
error_code Materialize(GlobalValue *GV) override;
error_code MaterializeModule(Module *M) override;
void Dematerialize(GlobalValue *GV) override;
/// @brief Main interface to parsing a bitcode buffer.
/// @returns true if an error occurred.

View File

@ -31,9 +31,9 @@ namespace {
explicit WriteBitcodePass(raw_ostream &o)
: ModulePass(ID), OS(o) {}
const char *getPassName() const { return "Bitcode Writer"; }
const char *getPassName() const override { return "Bitcode Writer"; }
bool runOnModule(Module &M) {
bool runOnModule(Module &M) override {
WriteBitcodeToFile(&M, OS);
return false;
}

View File

@ -71,7 +71,7 @@ public:
return DICtx->getKind() == CK_DWARF;
}
virtual void dump(raw_ostream &OS, DIDumpType DumpType = DIDT_All);
void dump(raw_ostream &OS, DIDumpType DumpType = DIDT_All) override;
/// Get the number of compile units in this context.
unsigned getNumCompileUnits() {
@ -148,12 +148,12 @@ public:
const DWARFDebugLine::LineTable *
getLineTableForCompileUnit(DWARFCompileUnit *cu);
virtual DILineInfo getLineInfoForAddress(uint64_t Address,
DILineInfoSpecifier Specifier = DILineInfoSpecifier());
virtual DILineInfoTable getLineInfoForAddressRange(uint64_t Address,
uint64_t Size, DILineInfoSpecifier Specifier = DILineInfoSpecifier());
virtual DIInliningInfo getInliningInfoForAddress(uint64_t Address,
DILineInfoSpecifier Specifier = DILineInfoSpecifier());
DILineInfo getLineInfoForAddress(uint64_t Address,
DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
DILineInfoTable getLineInfoForAddressRange(uint64_t Address, uint64_t Size,
DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
DIInliningInfo getInliningInfoForAddress(uint64_t Address,
DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
virtual bool isLittleEndian() const = 0;
virtual uint8_t getAddressSize() const = 0;
@ -231,35 +231,35 @@ class DWARFContextInMemory : public DWARFContext {
public:
DWARFContextInMemory(object::ObjectFile *);
~DWARFContextInMemory();
virtual bool isLittleEndian() const { return IsLittleEndian; }
virtual uint8_t getAddressSize() const { return AddressSize; }
virtual const Section &getInfoSection() { return InfoSection; }
virtual const TypeSectionMap &getTypesSections() { return TypesSections; }
virtual StringRef getAbbrevSection() { return AbbrevSection; }
virtual const Section &getLocSection() { return LocSection; }
virtual StringRef getARangeSection() { return ARangeSection; }
virtual StringRef getDebugFrameSection() { return DebugFrameSection; }
virtual const Section &getLineSection() { return LineSection; }
virtual const Section &getLineDWOSection() { return LineDWOSection; }
virtual StringRef getStringSection() { return StringSection; }
virtual StringRef getRangeSection() { return RangeSection; }
virtual StringRef getPubNamesSection() { return PubNamesSection; }
virtual StringRef getPubTypesSection() { return PubTypesSection; }
virtual StringRef getGnuPubNamesSection() { return GnuPubNamesSection; }
virtual StringRef getGnuPubTypesSection() { return GnuPubTypesSection; }
bool isLittleEndian() const override { return IsLittleEndian; }
uint8_t getAddressSize() const override { return AddressSize; }
const Section &getInfoSection() override { return InfoSection; }
const TypeSectionMap &getTypesSections() override { return TypesSections; }
StringRef getAbbrevSection() override { return AbbrevSection; }
const Section &getLocSection() override { return LocSection; }
StringRef getARangeSection() override { return ARangeSection; }
StringRef getDebugFrameSection() override { return DebugFrameSection; }
const Section &getLineSection() override { return LineSection; }
const Section &getLineDWOSection() override { return LineDWOSection; }
StringRef getStringSection() override { return StringSection; }
StringRef getRangeSection() override { return RangeSection; }
StringRef getPubNamesSection() override { return PubNamesSection; }
StringRef getPubTypesSection() override { return PubTypesSection; }
StringRef getGnuPubNamesSection() override { return GnuPubNamesSection; }
StringRef getGnuPubTypesSection() override { return GnuPubTypesSection; }
// Sections for DWARF5 split dwarf proposal.
virtual const Section &getInfoDWOSection() { return InfoDWOSection; }
virtual const TypeSectionMap &getTypesDWOSections() {
const Section &getInfoDWOSection() override { return InfoDWOSection; }
const TypeSectionMap &getTypesDWOSections() override {
return TypesDWOSections;
}
virtual StringRef getAbbrevDWOSection() { return AbbrevDWOSection; }
virtual StringRef getStringDWOSection() { return StringDWOSection; }
virtual StringRef getStringOffsetDWOSection() {
StringRef getAbbrevDWOSection() override { return AbbrevDWOSection; }
StringRef getStringDWOSection() override { return StringDWOSection; }
StringRef getStringOffsetDWOSection() override {
return StringOffsetDWOSection;
}
virtual StringRef getRangeDWOSection() { return RangeDWOSection; }
virtual StringRef getAddrSection() {
StringRef getRangeDWOSection() override { return RangeDWOSection; }
StringRef getAddrSection() override {
return AddrSection;
}
};

View File

@ -214,7 +214,7 @@ public:
~CIE() {
}
void dumpHeader(raw_ostream &OS) const {
void dumpHeader(raw_ostream &OS) const override {
OS << format("%08x %08x %08x CIE",
(uint32_t)Offset, (uint32_t)Length, DW_CIE_ID)
<< "\n";
@ -258,7 +258,7 @@ public:
~FDE() {
}
void dumpHeader(raw_ostream &OS) const {
void dumpHeader(raw_ostream &OS) const override {
OS << format("%08x %08x %08x FDE ",
(uint32_t)Offset, (uint32_t)Length, (int32_t)LinkedCIEOffset);
OS << format("cie=%08x pc=%08x...%08x\n",

View File

@ -231,7 +231,7 @@ public:
struct DumpingState : public State {
DumpingState(raw_ostream &OS) : OS(OS) {}
virtual ~DumpingState();
virtual void finalize();
void finalize() override;
private:
raw_ostream &OS;
};

View File

@ -87,7 +87,7 @@ public:
private:
Type *getImpl(Type *T);
/// remapType - Implement the ValueMapTypeRemapper interface.
Type *remapType(Type *SrcTy) {
Type *remapType(Type *SrcTy) override {
return get(SrcTy);
}
@ -372,7 +372,7 @@ namespace {
LazilyLinkFunctions(LazilyLinkFunctions) {
}
virtual Value *materializeValueFor(Value *V);
Value *materializeValueFor(Value *V) override;
};
/// ModuleLinker - This is an implementation class for the LinkModules