Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index 140c044eec588a5ff82ba390b51af8f0028409d9..a1f4ad184bfb185073616b4164d556b4ec91ce73 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -39,7 +39,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 FINAL : public CallWrapper { |
+class SafepointGenerator V8_FINAL : public CallWrapper { |
public: |
SafepointGenerator(LCodeGen* codegen, |
LPointerMap* pointers, |
@@ -49,11 +49,11 @@ class SafepointGenerator FINAL : public CallWrapper { |
deopt_mode_(mode) { } |
virtual ~SafepointGenerator() {} |
- virtual void BeforeCall(int call_size) const OVERRIDE { |
+ virtual void BeforeCall(int call_size) const V8_OVERRIDE { |
codegen_->EnsureSpaceForLazyDeopt(Deoptimizer::patch_size() - call_size); |
} |
- virtual void AfterCall() const OVERRIDE { |
+ virtual void AfterCall() const V8_OVERRIDE { |
codegen_->RecordSafepoint(pointers_, deopt_mode_); |
} |
@@ -2466,15 +2466,15 @@ void LCodeGen::DoInstanceOf(LInstanceOf* instr) { |
void LCodeGen::DoInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr) { |
- class DeferredInstanceOfKnownGlobal FINAL : public LDeferredCode { |
+ class DeferredInstanceOfKnownGlobal V8_FINAL : public LDeferredCode { |
public: |
DeferredInstanceOfKnownGlobal(LCodeGen* codegen, |
LInstanceOfKnownGlobal* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredInstanceOfKnownGlobal(instr_, &map_check_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
Label* map_check() { return &map_check_; } |
private: |
LInstanceOfKnownGlobal* instr_; |
@@ -3400,14 +3400,14 @@ void LCodeGen::EmitSmiMathAbs(LMathAbs* instr) { |
void LCodeGen::DoMathAbs(LMathAbs* instr) { |
// Class for deferred case. |
- class DeferredMathAbsTaggedHeapNumber FINAL : public LDeferredCode { |
+ class DeferredMathAbsTaggedHeapNumber V8_FINAL : public LDeferredCode { |
public: |
DeferredMathAbsTaggedHeapNumber(LCodeGen* codegen, LMathAbs* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredMathAbsTaggedHeapNumber(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LMathAbs* instr_; |
}; |
@@ -3632,12 +3632,12 @@ void LCodeGen::DoPower(LPower* instr) { |
void LCodeGen::DoRandom(LRandom* instr) { |
- class DeferredDoRandom FINAL : public LDeferredCode { |
+ class DeferredDoRandom V8_FINAL : public LDeferredCode { |
public: |
DeferredDoRandom(LCodeGen* codegen, LRandom* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { codegen()->DoDeferredRandom(instr_); } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual void Generate() V8_OVERRIDE { codegen()->DoDeferredRandom(instr_); } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LRandom* instr_; |
}; |
@@ -4322,14 +4322,14 @@ void LCodeGen::DoStringAdd(LStringAdd* instr) { |
void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) { |
- class DeferredStringCharCodeAt FINAL : public LDeferredCode { |
+ class DeferredStringCharCodeAt V8_FINAL : public LDeferredCode { |
public: |
DeferredStringCharCodeAt(LCodeGen* codegen, LStringCharCodeAt* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredStringCharCodeAt(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LStringCharCodeAt* instr_; |
}; |
@@ -4376,14 +4376,14 @@ void LCodeGen::DoDeferredStringCharCodeAt(LStringCharCodeAt* instr) { |
void LCodeGen::DoStringCharFromCode(LStringCharFromCode* instr) { |
- class DeferredStringCharFromCode FINAL : public LDeferredCode { |
+ class DeferredStringCharFromCode V8_FINAL : public LDeferredCode { |
public: |
DeferredStringCharFromCode(LCodeGen* codegen, LStringCharFromCode* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredStringCharFromCode(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LStringCharFromCode* instr_; |
}; |
@@ -4472,14 +4472,14 @@ void LCodeGen::DoNumberTagI(LNumberTagI* instr) { |
void LCodeGen::DoNumberTagU(LNumberTagU* instr) { |
- class DeferredNumberTagU FINAL : public LDeferredCode { |
+ class DeferredNumberTagU V8_FINAL : public LDeferredCode { |
public: |
DeferredNumberTagU(LCodeGen* codegen, LNumberTagU* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredNumberTagU(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LNumberTagU* instr_; |
}; |
@@ -4535,14 +4535,14 @@ void LCodeGen::DoDeferredNumberTagU(LNumberTagU* instr) { |
void LCodeGen::DoNumberTagD(LNumberTagD* instr) { |
- class DeferredNumberTagD FINAL : public LDeferredCode { |
+ class DeferredNumberTagD V8_FINAL : public LDeferredCode { |
public: |
DeferredNumberTagD(LCodeGen* codegen, LNumberTagD* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredNumberTagD(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LNumberTagD* instr_; |
}; |
@@ -4704,12 +4704,14 @@ void LCodeGen::DoDeferredTaggedToI(LTaggedToI* instr) { |
void LCodeGen::DoTaggedToI(LTaggedToI* instr) { |
- class DeferredTaggedToI FINAL : public LDeferredCode { |
+ class DeferredTaggedToI V8_FINAL : public LDeferredCode { |
public: |
DeferredTaggedToI(LCodeGen* codegen, LTaggedToI* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { codegen()->DoDeferredTaggedToI(instr_); } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual void Generate() V8_OVERRIDE { |
+ codegen()->DoDeferredTaggedToI(instr_); |
+ } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LTaggedToI* instr_; |
}; |
@@ -4906,17 +4908,17 @@ void LCodeGen::DoDeferredInstanceMigration(LCheckMaps* instr, Register object) { |
void LCodeGen::DoCheckMaps(LCheckMaps* instr) { |
- class DeferredCheckMaps FINAL : public LDeferredCode { |
+ class DeferredCheckMaps V8_FINAL : public LDeferredCode { |
public: |
DeferredCheckMaps(LCodeGen* codegen, LCheckMaps* instr, Register object) |
: LDeferredCode(codegen), instr_(instr), object_(object) { |
SetExit(check_maps()); |
} |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredInstanceMigration(instr_, object_); |
} |
Label* check_maps() { return &check_maps_; } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LCheckMaps* instr_; |
Label check_maps_; |
@@ -5006,12 +5008,14 @@ void LCodeGen::DoClampTToUint8(LClampTToUint8* instr) { |
void LCodeGen::DoAllocate(LAllocate* instr) { |
- class DeferredAllocate FINAL : public LDeferredCode { |
+ class DeferredAllocate V8_FINAL : public LDeferredCode { |
public: |
DeferredAllocate(LCodeGen* codegen, LAllocate* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { codegen()->DoDeferredAllocate(instr_); } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual void Generate() V8_OVERRIDE { |
+ codegen()->DoDeferredAllocate(instr_); |
+ } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LAllocate* instr_; |
}; |
@@ -5367,14 +5371,14 @@ void LCodeGen::DoDeferredStackCheck(LStackCheck* instr) { |
void LCodeGen::DoStackCheck(LStackCheck* instr) { |
- class DeferredStackCheck FINAL : public LDeferredCode { |
+ class DeferredStackCheck V8_FINAL : public LDeferredCode { |
public: |
DeferredStackCheck(LCodeGen* codegen, LStackCheck* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ virtual void Generate() V8_OVERRIDE { |
codegen()->DoDeferredStackCheck(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ virtual LInstruction* instr() V8_OVERRIDE { return instr_; } |
private: |
LStackCheck* instr_; |
}; |