Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index e323e0d210b3e8bc3280555cb612db07ea5b143d..ba46bad3b018e2cb81632ab86bd1362364fdbda1 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -27,9 +27,9 @@ class SafepointGenerator FINAL : public CallWrapper { |
deopt_mode_(mode) { } |
virtual ~SafepointGenerator() {} |
- virtual void BeforeCall(int call_size) const OVERRIDE {} |
+ void BeforeCall(int call_size) const OVERRIDE {} |
- virtual void AfterCall() const OVERRIDE { |
+ void AfterCall() const OVERRIDE { |
codegen_->RecordSafepoint(pointers_, deopt_mode_); |
} |
@@ -2785,11 +2785,11 @@ void LCodeGen::DoInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr) { |
DeferredInstanceOfKnownGlobal(LCodeGen* codegen, |
LInstanceOfKnownGlobal* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredInstanceOfKnownGlobal(instr_, &map_check_, |
&load_bool_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
Label* map_check() { return &map_check_; } |
Label* load_bool() { return &load_bool_; } |
@@ -3761,10 +3761,11 @@ void LCodeGen::DoMathAbs(LMathAbs* instr) { |
public: |
DeferredMathAbsTaggedHeapNumber(LCodeGen* codegen, LMathAbs* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredMathAbsTaggedHeapNumber(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LMathAbs* instr_; |
}; |
@@ -4530,10 +4531,9 @@ void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) { |
public: |
DeferredStringCharCodeAt(LCodeGen* codegen, LStringCharCodeAt* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
- codegen()->DoDeferredStringCharCodeAt(instr_); |
- } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ void Generate() OVERRIDE { codegen()->DoDeferredStringCharCodeAt(instr_); } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LStringCharCodeAt* instr_; |
}; |
@@ -4586,10 +4586,11 @@ void LCodeGen::DoStringCharFromCode(LStringCharFromCode* instr) { |
public: |
DeferredStringCharFromCode(LCodeGen* codegen, LStringCharFromCode* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredStringCharFromCode(instr_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LStringCharFromCode* instr_; |
}; |
@@ -4663,14 +4664,15 @@ void LCodeGen::DoNumberTagI(LNumberTagI* instr) { |
public: |
DeferredNumberTagI(LCodeGen* codegen, LNumberTagI* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredNumberTagIU(instr_, |
instr_->value(), |
instr_->temp1(), |
instr_->temp2(), |
SIGNED_INT32); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LNumberTagI* instr_; |
}; |
@@ -4690,14 +4692,15 @@ void LCodeGen::DoNumberTagU(LNumberTagU* instr) { |
public: |
DeferredNumberTagU(LCodeGen* codegen, LNumberTagU* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredNumberTagIU(instr_, |
instr_->value(), |
instr_->temp1(), |
instr_->temp2(), |
UNSIGNED_INT32); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LNumberTagU* instr_; |
}; |
@@ -4784,10 +4787,9 @@ void LCodeGen::DoNumberTagD(LNumberTagD* instr) { |
public: |
DeferredNumberTagD(LCodeGen* codegen, LNumberTagD* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
- codegen()->DoDeferredNumberTagD(instr_); |
- } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ void Generate() OVERRIDE { codegen()->DoDeferredNumberTagD(instr_); } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LNumberTagD* instr_; |
}; |
@@ -5003,10 +5005,9 @@ void LCodeGen::DoTaggedToI(LTaggedToI* instr) { |
public: |
DeferredTaggedToI(LCodeGen* codegen, LTaggedToI* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
- codegen()->DoDeferredTaggedToI(instr_); |
- } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ void Generate() OVERRIDE { codegen()->DoDeferredTaggedToI(instr_); } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LTaggedToI* instr_; |
}; |
@@ -5200,11 +5201,12 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) { |
: LDeferredCode(codegen), instr_(instr), object_(object) { |
SetExit(check_maps()); |
} |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredInstanceMigration(instr_, object_); |
} |
Label* check_maps() { return &check_maps_; } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LCheckMaps* instr_; |
Label check_maps_; |
@@ -5328,10 +5330,9 @@ void LCodeGen::DoAllocate(LAllocate* instr) { |
public: |
DeferredAllocate(LCodeGen* codegen, LAllocate* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
- codegen()->DoDeferredAllocate(instr_); |
- } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ void Generate() OVERRIDE { codegen()->DoDeferredAllocate(instr_); } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LAllocate* instr_; |
}; |
@@ -5693,10 +5694,9 @@ void LCodeGen::DoStackCheck(LStackCheck* instr) { |
public: |
DeferredStackCheck(LCodeGen* codegen, LStackCheck* instr) |
: LDeferredCode(codegen), instr_(instr) { } |
- virtual void Generate() OVERRIDE { |
- codegen()->DoDeferredStackCheck(instr_); |
- } |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ void Generate() OVERRIDE { codegen()->DoDeferredStackCheck(instr_); } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LStackCheck* instr_; |
}; |
@@ -5849,10 +5849,11 @@ void LCodeGen::DoLoadFieldByIndex(LLoadFieldByIndex* instr) { |
object_(object), |
index_(index) { |
} |
- virtual void Generate() OVERRIDE { |
+ void Generate() OVERRIDE { |
codegen()->DoDeferredLoadMutableDouble(instr_, result_, object_, index_); |
} |
- virtual LInstruction* instr() OVERRIDE { return instr_; } |
+ LInstruction* instr() OVERRIDE { return instr_; } |
+ |
private: |
LLoadFieldByIndex* instr_; |
Register result_; |