Skip to content

S
swiftshader
Commit 3ce1a991 by Jan Voung
Options

Subzero: Fix some -Winconsistent-missing-override that clang 3.6 warns about.

I'd like to bump the *trusted* clang compiler also, since the really old trusted clang compiler seems to crash if we pair old clang with new libcxx. (So the merge will probably have to bump the trusted clang compiler to a newer rev). BUG= https://code.google.com/p/nativeclient/issues/detail?id=4026 R=stichnot@chromium.org Review URL: https://codereview.chromium.org/898693002
parent 8e92838b
Showing with 2 additions and 4 deletions
src/IceInst.h
...@@ -371,7 +371,7 @@ public: ...@@ -371,7 +371,7 @@ public:
Operand *getArg(SizeT I) const { return getSrc(I + 1); } Operand *getArg(SizeT I) const { return getSrc(I + 1); }
SizeT getNumArgs() const { return getSrcSize() - 1; } SizeT getNumArgs() const { return getSrcSize() - 1; }
bool isTailcall() const { return HasTailCall; } bool isTailcall() const { return HasTailCall; }
void dump(const Cfg *Func) const; void dump(const Cfg *Func) const override;
static bool classof(const Inst *Inst) { return Inst->getKind() == Call; } static bool classof(const Inst *Inst) { return Inst->getKind() == Call; }
Type getReturnType() const; Type getReturnType() const;
......
src/IceOperand.h
...@@ -104,10 +104,8 @@ public: ...@@ -104,10 +104,8 @@ public:
void emitPoolLabel(Ostream &Str) const { void emitPoolLabel(Ostream &Str) const {
Str << ".L$" << getType() << "$" << PoolEntryID; Str << ".L$" << getType() << "$" << PoolEntryID;
} }
using Operand::dump;
void emit(const Cfg *Func) const override { emit(Func->getContext()); } void emit(const Cfg *Func) const override { emit(Func->getContext()); }
virtual void emit(GlobalContext *Ctx) const = 0; virtual void emit(GlobalContext *Ctx) const = 0;
void dump(const Cfg *Func, Ostream &Str) const = 0;
static bool classof(const Operand *Operand) { static bool classof(const Operand *Operand) {
OperandKind Kind = Operand->getKind(); OperandKind Kind = Operand->getKind();
......
src/IceTargetLoweringX8632.h
...@@ -180,7 +180,7 @@ protected: ...@@ -180,7 +180,7 @@ protected:
void makeRandomRegisterPermutation( void makeRandomRegisterPermutation(
llvm::SmallVectorImpl<int32_t> &Permutation, llvm::SmallVectorImpl<int32_t> &Permutation,
const llvm::SmallBitVector &ExcludeRegisters) const; const llvm::SmallBitVector &ExcludeRegisters) const override;
// The following are helpers that insert lowered x86 instructions // The following are helpers that insert lowered x86 instructions
// with minimal syntactic overhead, so that the lowering code can // with minimal syntactic overhead, so that the lowering code can
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment