| Index: src/x64/lithium-codegen-x64.cc
 | 
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
 | 
| index b0528b2e504949a00ecdb987f6262d3b7e952309..74bb1327483111248f7381b6a1c35894ee6fd412 100644
 | 
| --- a/src/x64/lithium-codegen-x64.cc
 | 
| +++ b/src/x64/lithium-codegen-x64.cc
 | 
| @@ -16,7 +16,7 @@ namespace internal {
 | 
|  
 | 
|  // When invoking builtins, we need to record the safepoint in the middle of
 | 
|  // the invoke instruction sequence generated by the macro assembler.
 | 
| -class SafepointGenerator V8_FINAL : public CallWrapper {
 | 
| +class SafepointGenerator FINAL : public CallWrapper {
 | 
|   public:
 | 
|    SafepointGenerator(LCodeGen* codegen,
 | 
|                       LPointerMap* pointers,
 | 
| @@ -26,9 +26,9 @@ class SafepointGenerator V8_FINAL : public CallWrapper {
 | 
|          deopt_mode_(mode) { }
 | 
|    virtual ~SafepointGenerator() {}
 | 
|  
 | 
| -  virtual void BeforeCall(int call_size) const V8_OVERRIDE {}
 | 
| +  virtual void BeforeCall(int call_size) const OVERRIDE {}
 | 
|  
 | 
| -  virtual void AfterCall() const V8_OVERRIDE {
 | 
| +  virtual void AfterCall() const OVERRIDE {
 | 
|      codegen_->RecordSafepoint(pointers_, deopt_mode_);
 | 
|    }
 | 
|  
 | 
| @@ -2670,15 +2670,15 @@ void LCodeGen::DoInstanceOf(LInstanceOf* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr) {
 | 
| -  class DeferredInstanceOfKnownGlobal V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredInstanceOfKnownGlobal FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredInstanceOfKnownGlobal(LCodeGen* codegen,
 | 
|                                    LInstanceOfKnownGlobal* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredInstanceOfKnownGlobal(instr_, &map_check_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|      Label* map_check() { return &map_check_; }
 | 
|     private:
 | 
|      LInstanceOfKnownGlobal* instr_;
 | 
| @@ -3653,14 +3653,14 @@ void LCodeGen::EmitSmiMathAbs(LMathAbs* instr) {
 | 
|  
 | 
|  void LCodeGen::DoMathAbs(LMathAbs* instr) {
 | 
|    // Class for deferred case.
 | 
| -  class DeferredMathAbsTaggedHeapNumber V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredMathAbsTaggedHeapNumber FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredMathAbsTaggedHeapNumber(LCodeGen* codegen, LMathAbs* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredMathAbsTaggedHeapNumber(instr_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LMathAbs* instr_;
 | 
|    };
 | 
| @@ -4519,14 +4519,14 @@ void LCodeGen::DoStringAdd(LStringAdd* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) {
 | 
| -  class DeferredStringCharCodeAt V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredStringCharCodeAt FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredStringCharCodeAt(LCodeGen* codegen, LStringCharCodeAt* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredStringCharCodeAt(instr_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LStringCharCodeAt* instr_;
 | 
|    };
 | 
| @@ -4574,14 +4574,14 @@ void LCodeGen::DoDeferredStringCharCodeAt(LStringCharCodeAt* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoStringCharFromCode(LStringCharFromCode* instr) {
 | 
| -  class DeferredStringCharFromCode V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredStringCharFromCode FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredStringCharFromCode(LCodeGen* codegen, LStringCharFromCode* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredStringCharFromCode(instr_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LStringCharFromCode* instr_;
 | 
|    };
 | 
| @@ -4646,15 +4646,15 @@ void LCodeGen::DoUint32ToDouble(LUint32ToDouble* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoNumberTagI(LNumberTagI* instr) {
 | 
| -  class DeferredNumberTagI V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredNumberTagI FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredNumberTagI(LCodeGen* codegen, LNumberTagI* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredNumberTagIU(instr_, instr_->value(), instr_->temp1(),
 | 
|                                         instr_->temp2(), SIGNED_INT32);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LNumberTagI* instr_;
 | 
|    };
 | 
| @@ -4676,15 +4676,15 @@ void LCodeGen::DoNumberTagI(LNumberTagI* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoNumberTagU(LNumberTagU* instr) {
 | 
| -  class DeferredNumberTagU V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredNumberTagU FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredNumberTagU(LCodeGen* codegen, LNumberTagU* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredNumberTagIU(instr_, instr_->value(), instr_->temp1(),
 | 
|                                         instr_->temp2(), UNSIGNED_INT32);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LNumberTagU* instr_;
 | 
|    };
 | 
| @@ -4763,14 +4763,14 @@ void LCodeGen::DoDeferredNumberTagIU(LInstruction* instr,
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoNumberTagD(LNumberTagD* instr) {
 | 
| -  class DeferredNumberTagD V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredNumberTagD FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredNumberTagD(LCodeGen* codegen, LNumberTagD* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredNumberTagD(instr_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LNumberTagD* instr_;
 | 
|    };
 | 
| @@ -4951,14 +4951,14 @@ void LCodeGen::DoDeferredTaggedToI(LTaggedToI* instr, Label* done) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoTaggedToI(LTaggedToI* instr) {
 | 
| -  class DeferredTaggedToI V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredTaggedToI FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredTaggedToI(LCodeGen* codegen, LTaggedToI* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredTaggedToI(instr_, done());
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LTaggedToI* instr_;
 | 
|    };
 | 
| @@ -5134,17 +5134,17 @@ void LCodeGen::DoDeferredInstanceMigration(LCheckMaps* instr, Register object) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
 | 
| -  class DeferredCheckMaps V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredCheckMaps FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredCheckMaps(LCodeGen* codegen, LCheckMaps* instr, Register object)
 | 
|          : LDeferredCode(codegen), instr_(instr), object_(object) {
 | 
|        SetExit(check_maps());
 | 
|      }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredInstanceMigration(instr_, object_);
 | 
|      }
 | 
|      Label* check_maps() { return &check_maps_; }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LCheckMaps* instr_;
 | 
|      Label check_maps_;
 | 
| @@ -5265,14 +5265,14 @@ void LCodeGen::DoConstructDouble(LConstructDouble* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoAllocate(LAllocate* instr) {
 | 
| -  class DeferredAllocate V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredAllocate FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredAllocate(LCodeGen* codegen, LAllocate* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredAllocate(instr_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LAllocate* instr_;
 | 
|    };
 | 
| @@ -5641,14 +5641,14 @@ void LCodeGen::DoDeferredStackCheck(LStackCheck* instr) {
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoStackCheck(LStackCheck* instr) {
 | 
| -  class DeferredStackCheck V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredStackCheck FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredStackCheck(LCodeGen* codegen, LStackCheck* instr)
 | 
|          : LDeferredCode(codegen), instr_(instr) { }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredStackCheck(instr_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LStackCheck* instr_;
 | 
|    };
 | 
| @@ -5781,7 +5781,7 @@ void LCodeGen::DoDeferredLoadMutableDouble(LLoadFieldByIndex* instr,
 | 
|  
 | 
|  
 | 
|  void LCodeGen::DoLoadFieldByIndex(LLoadFieldByIndex* instr) {
 | 
| -  class DeferredLoadMutableDouble V8_FINAL : public LDeferredCode {
 | 
| +  class DeferredLoadMutableDouble FINAL : public LDeferredCode {
 | 
|     public:
 | 
|      DeferredLoadMutableDouble(LCodeGen* codegen,
 | 
|                                LLoadFieldByIndex* instr,
 | 
| @@ -5792,10 +5792,10 @@ void LCodeGen::DoLoadFieldByIndex(LLoadFieldByIndex* instr) {
 | 
|            object_(object),
 | 
|            index_(index) {
 | 
|      }
 | 
| -    virtual void Generate() V8_OVERRIDE {
 | 
| +    virtual void Generate() OVERRIDE {
 | 
|        codegen()->DoDeferredLoadMutableDouble(instr_, object_, index_);
 | 
|      }
 | 
| -    virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
 | 
| +    virtual LInstruction* instr() OVERRIDE { return instr_; }
 | 
|     private:
 | 
|      LLoadFieldByIndex* instr_;
 | 
|      Register object_;
 | 
| 
 |