Remove 'virtual' keyword from methods markedwith 'override' keyword.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216823 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2014-08-30 16:48:34 +00:00
parent 847998f0dd
commit 3af13568fb
17 changed files with 80 additions and 83 deletions

View File

@ -324,7 +324,7 @@ public:
} }
/// \see DiagnosticInfoOptimizationBase::isEnabled. /// \see DiagnosticInfoOptimizationBase::isEnabled.
virtual bool isEnabled() const override; bool isEnabled() const override;
}; };
/// Diagnostic information for missed-optimization remarks. /// Diagnostic information for missed-optimization remarks.
@ -350,7 +350,7 @@ public:
} }
/// \see DiagnosticInfoOptimizationBase::isEnabled. /// \see DiagnosticInfoOptimizationBase::isEnabled.
virtual bool isEnabled() const override; bool isEnabled() const override;
}; };
/// Diagnostic information for optimization analysis remarks. /// Diagnostic information for optimization analysis remarks.
@ -377,7 +377,7 @@ public:
} }
/// \see DiagnosticInfoOptimizationBase::isEnabled. /// \see DiagnosticInfoOptimizationBase::isEnabled.
virtual bool isEnabled() const override; bool isEnabled() const override;
}; };
// Create wrappers for C Binding types (see CBindingWrapping.h). // Create wrappers for C Binding types (see CBindingWrapping.h).
@ -432,7 +432,7 @@ public:
} }
/// \see DiagnosticInfoOptimizationBase::isEnabled. /// \see DiagnosticInfoOptimizationBase::isEnabled.
virtual bool isEnabled() const override; bool isEnabled() const override;
}; };
/// Emit a warning when loop vectorization is specified but fails. \p Fn is the /// Emit a warning when loop vectorization is specified but fails. \p Fn is the

View File

@ -245,7 +245,7 @@ struct NoTTI final : ImmutablePass, TargetTransformInfo {
initializeNoTTIPass(*PassRegistry::getPassRegistry()); initializeNoTTIPass(*PassRegistry::getPassRegistry());
} }
virtual void initializePass() override { void initializePass() override {
// Note that this subclass is special, and must *not* call initializeTTI as // Note that this subclass is special, and must *not* call initializeTTI as
// it does not chain. // it does not chain.
TopTTI = this; TopTTI = this;
@ -254,7 +254,7 @@ struct NoTTI final : ImmutablePass, TargetTransformInfo {
DL = DLP ? &DLP->getDataLayout() : nullptr; DL = DLP ? &DLP->getDataLayout() : nullptr;
} }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
// Note that this subclass is special, and must *not* call // Note that this subclass is special, and must *not* call
// TTI::getAnalysisUsage as it breaks the recursion. // TTI::getAnalysisUsage as it breaks the recursion.
} }
@ -263,7 +263,7 @@ struct NoTTI final : ImmutablePass, TargetTransformInfo {
static char ID; static char ID;
/// Provide necessary pointer adjustments for the two base classes. /// Provide necessary pointer adjustments for the two base classes.
virtual void *getAdjustedAnalysisPointer(const void *ID) override { void *getAdjustedAnalysisPointer(const void *ID) override {
if (ID == &TargetTransformInfo::ID) if (ID == &TargetTransformInfo::ID)
return (TargetTransformInfo*)this; return (TargetTransformInfo*)this;
return this; return this;

View File

@ -37,11 +37,11 @@ public:
static char ID; // Pass identification, replacement for typeid. static char ID; // Pass identification, replacement for typeid.
explicit AArch64DeadRegisterDefinitions() : MachineFunctionPass(ID) {} explicit AArch64DeadRegisterDefinitions() : MachineFunctionPass(ID) {}
virtual bool runOnMachineFunction(MachineFunction &F) override; bool runOnMachineFunction(MachineFunction &F) override;
const char *getPassName() const override { return "Dead register definitions"; } const char *getPassName() const override { return "Dead register definitions"; }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.setPreservesCFG(); AU.setPreservesCFG();
MachineFunctionPass::getAnalysisUsage(AU); MachineFunctionPass::getAnalysisUsage(AU);
} }

View File

@ -39,7 +39,7 @@ public:
static char ID; static char ID;
AArch64StorePairSuppress() : MachineFunctionPass(ID) {} AArch64StorePairSuppress() : MachineFunctionPass(ID) {}
virtual const char *getPassName() const override { const char *getPassName() const override {
return "AArch64 Store Pair Suppression"; return "AArch64 Store Pair Suppression";
} }
@ -50,7 +50,7 @@ private:
bool isNarrowFPStore(const MachineInstr &MI); bool isNarrowFPStore(const MachineInstr &MI);
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.setPreservesCFG(); AU.setPreservesCFG();
AU.addRequired<MachineTraceMetrics>(); AU.addRequired<MachineTraceMetrics>();
AU.addPreserved<MachineTraceMetrics>(); AU.addPreserved<MachineTraceMetrics>();

View File

@ -101,7 +101,7 @@ public:
/// Schedule - This is called back from ScheduleDAGInstrs::Run() when it's /// Schedule - This is called back from ScheduleDAGInstrs::Run() when it's
/// time to do some work. /// time to do some work.
virtual void schedule() override; void schedule() override;
/// Perform platform-specific DAG postprocessing. /// Perform platform-specific DAG postprocessing.
void postprocessDAG(); void postprocessDAG();
}; };
@ -209,15 +209,15 @@ public:
: DAG(nullptr), SchedModel(nullptr), Top(TopQID, "TopQ"), : DAG(nullptr), SchedModel(nullptr), Top(TopQID, "TopQ"),
Bot(BotQID, "BotQ") {} Bot(BotQID, "BotQ") {}
virtual void initialize(ScheduleDAGMI *dag) override; void initialize(ScheduleDAGMI *dag) override;
virtual SUnit *pickNode(bool &IsTopNode) override; SUnit *pickNode(bool &IsTopNode) override;
virtual void schedNode(SUnit *SU, bool IsTopNode) override; void schedNode(SUnit *SU, bool IsTopNode) override;
virtual void releaseTopNode(SUnit *SU) override; void releaseTopNode(SUnit *SU) override;
virtual void releaseBottomNode(SUnit *SU) override; void releaseBottomNode(SUnit *SU) override;
unsigned ReportPackets() { unsigned ReportPackets() {
return Top.ResourceModel->getTotalPackets() + return Top.ResourceModel->getTotalPackets() +

View File

@ -35,7 +35,7 @@ public:
bool runOnMachineFunction(MachineFunction &MF); bool runOnMachineFunction(MachineFunction &MF);
virtual const char *getPassName() const { const char *getPassName() const override {
return "NVPTX Replace Image Handles"; return "NVPTX Replace Image Handles";
} }
private: private:

View File

@ -129,10 +129,10 @@ public:
void emitMachine(StringRef CPU) override { void emitMachine(StringRef CPU) override {
OS << "\t.machine " << CPU << '\n'; OS << "\t.machine " << CPU << '\n';
} }
virtual void emitAbiVersion(int AbiVersion) override { void emitAbiVersion(int AbiVersion) override {
OS << "\t.abiversion " << AbiVersion << '\n'; OS << "\t.abiversion " << AbiVersion << '\n';
} }
virtual void emitLocalEntry(MCSymbol *S, const MCExpr *LocalOffset) { void emitLocalEntry(MCSymbol *S, const MCExpr *LocalOffset) override {
OS << "\t.localentry\t" << *S << ", " << *LocalOffset << '\n'; OS << "\t.localentry\t" << *S << ", " << *LocalOffset << '\n';
} }
}; };
@ -143,7 +143,7 @@ public:
MCELFStreamer &getStreamer() { MCELFStreamer &getStreamer() {
return static_cast<MCELFStreamer &>(Streamer); return static_cast<MCELFStreamer &>(Streamer);
} }
virtual void emitTCEntry(const MCSymbol &S) override { void emitTCEntry(const MCSymbol &S) override {
// Creates a R_PPC64_TOC relocation // Creates a R_PPC64_TOC relocation
Streamer.EmitSymbolValue(&S, 8); Streamer.EmitSymbolValue(&S, 8);
} }
@ -151,14 +151,14 @@ public:
// FIXME: Is there anything to do in here or does this directive only // FIXME: Is there anything to do in here or does this directive only
// limit the parser? // limit the parser?
} }
virtual void emitAbiVersion(int AbiVersion) override { void emitAbiVersion(int AbiVersion) override {
MCAssembler &MCA = getStreamer().getAssembler(); MCAssembler &MCA = getStreamer().getAssembler();
unsigned Flags = MCA.getELFHeaderEFlags(); unsigned Flags = MCA.getELFHeaderEFlags();
Flags &= ~ELF::EF_PPC64_ABI; Flags &= ~ELF::EF_PPC64_ABI;
Flags |= (AbiVersion & ELF::EF_PPC64_ABI); Flags |= (AbiVersion & ELF::EF_PPC64_ABI);
MCA.setELFHeaderEFlags(Flags); MCA.setELFHeaderEFlags(Flags);
} }
virtual void emitLocalEntry(MCSymbol *S, const MCExpr *LocalOffset) { void emitLocalEntry(MCSymbol *S, const MCExpr *LocalOffset) override {
MCAssembler &MCA = getStreamer().getAssembler(); MCAssembler &MCA = getStreamer().getAssembler();
MCSymbolData &Data = getStreamer().getOrCreateSymbolData(S); MCSymbolData &Data = getStreamer().getOrCreateSymbolData(S);
@ -196,10 +196,10 @@ public:
// FIXME: We should update the CPUType, CPUSubType in the Object file if // FIXME: We should update the CPUType, CPUSubType in the Object file if
// the new values are different from the defaults. // the new values are different from the defaults.
} }
virtual void emitAbiVersion(int AbiVersion) override { void emitAbiVersion(int AbiVersion) override {
llvm_unreachable("Unknown pseudo-op: .abiversion"); llvm_unreachable("Unknown pseudo-op: .abiversion");
} }
virtual void emitLocalEntry(MCSymbol *S, const MCExpr *LocalOffset) { void emitLocalEntry(MCSymbol *S, const MCExpr *LocalOffset) override {
llvm_unreachable("Unknown pseudo-op: .localentry"); llvm_unreachable("Unknown pseudo-op: .localentry");
} }
}; };

View File

@ -76,10 +76,10 @@ class PPCHazardRecognizer970 : public ScheduleHazardRecognizer {
public: public:
PPCHazardRecognizer970(const ScheduleDAG &DAG); PPCHazardRecognizer970(const ScheduleDAG &DAG);
virtual HazardType getHazardType(SUnit *SU, int Stalls) override; HazardType getHazardType(SUnit *SU, int Stalls) override;
virtual void EmitInstruction(SUnit *SU) override; void EmitInstruction(SUnit *SU) override;
virtual void AdvanceCycle() override; void AdvanceCycle() override;
virtual void Reset() override; void Reset() override;
private: private:
/// EndDispatchGroup - Called when we are finishing a new dispatch group. /// EndDispatchGroup - Called when we are finishing a new dispatch group.

View File

@ -52,11 +52,11 @@ public:
initializePPCTTIPass(*PassRegistry::getPassRegistry()); initializePPCTTIPass(*PassRegistry::getPassRegistry());
} }
virtual void initializePass() override { void initializePass() override {
pushTTIStack(this); pushTTIStack(this);
} }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
TargetTransformInfo::getAnalysisUsage(AU); TargetTransformInfo::getAnalysisUsage(AU);
} }
@ -64,7 +64,7 @@ public:
static char ID; static char ID;
/// Provide necessary pointer adjustments for the two base classes. /// Provide necessary pointer adjustments for the two base classes.
virtual void *getAdjustedAnalysisPointer(const void *ID) override { void *getAdjustedAnalysisPointer(const void *ID) override {
if (ID == &TargetTransformInfo::ID) if (ID == &TargetTransformInfo::ID)
return (TargetTransformInfo*)this; return (TargetTransformInfo*)this;
return this; return this;
@ -79,9 +79,8 @@ public:
unsigned getIntImmCost(Intrinsic::ID IID, unsigned Idx, const APInt &Imm, unsigned getIntImmCost(Intrinsic::ID IID, unsigned Idx, const APInt &Imm,
Type *Ty) const override; Type *Ty) const override;
virtual PopcntSupportKind PopcntSupportKind getPopcntSupport(unsigned TyWidth) const override;
getPopcntSupport(unsigned TyWidth) const override; void getUnrollingPreferences(
virtual void getUnrollingPreferences(
Loop *L, UnrollingPreferences &UP) const override; Loop *L, UnrollingPreferences &UP) const override;
/// @} /// @}
@ -89,24 +88,22 @@ public:
/// \name Vector TTI Implementations /// \name Vector TTI Implementations
/// @{ /// @{
virtual unsigned getNumberOfRegisters(bool Vector) const override; unsigned getNumberOfRegisters(bool Vector) const override;
virtual unsigned getRegisterBitWidth(bool Vector) const override; unsigned getRegisterBitWidth(bool Vector) const override;
virtual unsigned getMaximumUnrollFactor() const override; unsigned getMaximumUnrollFactor() const override;
virtual unsigned unsigned getArithmeticInstrCost(unsigned Opcode, Type *Ty, OperandValueKind,
getArithmeticInstrCost(unsigned Opcode, Type *Ty, OperandValueKind, OperandValueKind, OperandValueProperties,
OperandValueKind, OperandValueProperties, OperandValueProperties) const override;
OperandValueProperties) const override; unsigned getShuffleCost(ShuffleKind Kind, Type *Tp,
virtual unsigned getShuffleCost(ShuffleKind Kind, Type *Tp, int Index, Type *SubTp) const override;
int Index, Type *SubTp) const override; unsigned getCastInstrCost(unsigned Opcode, Type *Dst,
virtual unsigned getCastInstrCost(unsigned Opcode, Type *Dst, Type *Src) const override;
Type *Src) const override; unsigned getCmpSelInstrCost(unsigned Opcode, Type *ValTy,
virtual unsigned getCmpSelInstrCost(unsigned Opcode, Type *ValTy, Type *CondTy) const override;
Type *CondTy) const override; unsigned getVectorInstrCost(unsigned Opcode, Type *Val,
virtual unsigned getVectorInstrCost(unsigned Opcode, Type *Val, unsigned Index) const override;
unsigned Index) const override; unsigned getMemoryOpCost(unsigned Opcode, Type *Src, unsigned Alignment,
virtual unsigned getMemoryOpCost(unsigned Opcode, Type *Src, unsigned AddressSpace) const override;
unsigned Alignment,
unsigned AddressSpace) const override;
/// @} /// @}
}; };

View File

@ -40,13 +40,13 @@ public:
initializeSIFixSGPRLiveRangesPass(*PassRegistry::getPassRegistry()); initializeSIFixSGPRLiveRangesPass(*PassRegistry::getPassRegistry());
} }
virtual bool runOnMachineFunction(MachineFunction &MF) override; bool runOnMachineFunction(MachineFunction &MF) override;
virtual const char *getPassName() const override { const char *getPassName() const override {
return "SI Fix SGPR live ranges"; return "SI Fix SGPR live ranges";
} }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<LiveIntervals>(); AU.addRequired<LiveIntervals>();
AU.addPreserved<LiveIntervals>(); AU.addPreserved<LiveIntervals>();
AU.addPreserved<SlotIndexes>(); AU.addPreserved<SlotIndexes>();

View File

@ -40,14 +40,14 @@ public:
initializeSILowerI1CopiesPass(*PassRegistry::getPassRegistry()); initializeSILowerI1CopiesPass(*PassRegistry::getPassRegistry());
} }
virtual bool runOnMachineFunction(MachineFunction &MF) override; bool runOnMachineFunction(MachineFunction &MF) override;
virtual const char *getPassName() const override { const char *getPassName() const override {
return "SI Lower il Copies"; return "SI Lower il Copies";
} }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<MachineDominatorTree>(); AU.addRequired<MachineDominatorTree>();
AU.setPreservesCFG(); AU.setPreservesCFG();
MachineFunctionPass::getAnalysisUsage(AU); MachineFunctionPass::getAnalysisUsage(AU);
} }

View File

@ -45,13 +45,13 @@ public:
SIShrinkInstructions() : MachineFunctionPass(ID) { SIShrinkInstructions() : MachineFunctionPass(ID) {
} }
virtual bool runOnMachineFunction(MachineFunction &MF) override; bool runOnMachineFunction(MachineFunction &MF) override;
virtual const char *getPassName() const override { const char *getPassName() const override {
return "SI Shrink Instructions"; return "SI Shrink Instructions";
} }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.setPreservesCFG(); AU.setPreservesCFG();
MachineFunctionPass::getAnalysisUsage(AU); MachineFunctionPass::getAnalysisUsage(AU);
} }

View File

@ -720,7 +720,7 @@ private:
llvm_unreachable("invalid mode"); llvm_unreachable("invalid mode");
} }
virtual bool OmitRegisterFromClobberLists(unsigned RegNo) override; bool OmitRegisterFromClobberLists(unsigned RegNo) override;
/// doSrcDstMatch - Returns true if operands are matching in their /// doSrcDstMatch - Returns true if operands are matching in their
/// word size (%si and %di, %esi and %edi, etc.). Order depends on /// word size (%si and %di, %esi and %edi, etc.). Order depends on

View File

@ -99,10 +99,10 @@ class XCoreTargetAsmStreamer : public XCoreTargetStreamer {
formatted_raw_ostream &OS; formatted_raw_ostream &OS;
public: public:
XCoreTargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS); XCoreTargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS);
virtual void emitCCTopData(StringRef Name) override; void emitCCTopData(StringRef Name) override;
virtual void emitCCTopFunction(StringRef Name) override; void emitCCTopFunction(StringRef Name) override;
virtual void emitCCBottomData(StringRef Name) override; void emitCCBottomData(StringRef Name) override;
virtual void emitCCBottomFunction(StringRef Name) override; void emitCCBottomFunction(StringRef Name) override;
}; };
XCoreTargetAsmStreamer::XCoreTargetAsmStreamer(MCStreamer &S, XCoreTargetAsmStreamer::XCoreTargetAsmStreamer(MCStreamer &S,

View File

@ -43,17 +43,17 @@ public:
initializeXCoreTTIPass(*PassRegistry::getPassRegistry()); initializeXCoreTTIPass(*PassRegistry::getPassRegistry());
} }
virtual void initializePass() override { void initializePass() override {
pushTTIStack(this); pushTTIStack(this);
} }
virtual void getAnalysisUsage(AnalysisUsage &AU) const override { void getAnalysisUsage(AnalysisUsage &AU) const override {
TargetTransformInfo::getAnalysisUsage(AU); TargetTransformInfo::getAnalysisUsage(AU);
} }
static char ID; static char ID;
virtual void *getAdjustedAnalysisPointer(const void *ID) override { void *getAdjustedAnalysisPointer(const void *ID) override {
if (ID == &TargetTransformInfo::ID) if (ID == &TargetTransformInfo::ID)
return (TargetTransformInfo*)this; return (TargetTransformInfo*)this;
return this; return this;

View File

@ -49,12 +49,12 @@ public:
cacheRelocations(); cacheRelocations();
} }
virtual void printFileHeaders() override; void printFileHeaders() override;
virtual void printSections() override; void printSections() override;
virtual void printRelocations() override; void printRelocations() override;
virtual void printSymbols() override; void printSymbols() override;
virtual void printDynamicSymbols() override; void printDynamicSymbols() override;
virtual void printUnwindInfo() override; void printUnwindInfo() override;
private: private:
void printSymbol(const SymbolRef &Sym); void printSymbol(const SymbolRef &Sym);

View File

@ -31,12 +31,12 @@ public:
: ObjDumper(Writer) : ObjDumper(Writer)
, Obj(Obj) { } , Obj(Obj) { }
virtual void printFileHeaders() override; void printFileHeaders() override;
virtual void printSections() override; void printSections() override;
virtual void printRelocations() override; void printRelocations() override;
virtual void printSymbols() override; void printSymbols() override;
virtual void printDynamicSymbols() override; void printDynamicSymbols() override;
virtual void printUnwindInfo() override; void printUnwindInfo() override;
private: private:
void printSymbol(const SymbolRef &Symbol); void printSymbol(const SymbolRef &Symbol);