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

Subzero: Fix some -Winconsistent-missing-override that clang 3.6 warns about.
3ce1a991 · Jan Voung · 8e92838b · 3ce1a991 · 3ce1a991 · 3ce1a991
Commit 3ce1a991 authored Feb 03, 2015 by Jan Voung
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

IceInst.h src/IceInst.h +1 -1

IceOperand.h src/IceOperand.h +0 -2

IceTargetLoweringX8632.h src/IceTargetLoweringX8632.h +1 -1

No files found.
--- a/src/IceInst.h
+++ b/src/IceInst.h
@@ -371,7 +371,7 @@ public:
  Operand *getArg(SizeT I) const { return getSrc(I + 1); }
  SizeT getNumArgs() const { return getSrcSize() - 1; }
  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; }
  Type getReturnType() const;


--- a/src/IceOperand.h
+++ b/src/IceOperand.h
@@ -104,10 +104,8 @@ public:
  void emitPoolLabel(Ostream &Str) const {
    Str << ".L$" << getType() << "$" << PoolEntryID;
  }
-  using Operand::dump;
  void emit(const Cfg *Func) const override { emit(Func->getContext()); }
  virtual void emit(GlobalContext *Ctx) const = 0;
-  void dump(const Cfg *Func, Ostream &Str) const = 0;

  static bool classof(const Operand *Operand) {
    OperandKind Kind = Operand->getKind();

--- a/src/IceTargetLoweringX8632.h
+++ b/src/IceTargetLoweringX8632.h
@@ -180,7 +180,7 @@ protected:

  void makeRandomRegisterPermutation(
      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
  // with minimal syntactic overhead, so that the lowering code can