Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 87ad6d9d50637bb043859e8ad9006485ab630e06..85baf7bd5424f09900577c94847d1b8e9dc53a86 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -1055,15 +1055,6 @@ void LCodeGen::RecordSafepointWithRegisters(LPointerMap* pointers, |
} |
-void LCodeGen::RecordSafepointWithRegistersAndDoubles( |
- LPointerMap* pointers, |
- int arguments, |
- Safepoint::DeoptMode deopt_mode) { |
- RecordSafepoint( |
- pointers, Safepoint::kWithRegistersAndDoubles, arguments, deopt_mode); |
-} |
- |
- |
void LCodeGen::RecordAndWritePosition(int position) { |
if (position == RelocInfo::kNoPosition) return; |
masm()->positions_recorder()->RecordPosition(position); |
@@ -2883,7 +2874,7 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr, |
flags | InstanceofStub::kReturnTrueFalseObject); |
InstanceofStub stub(isolate(), flags); |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
LoadContextFromDeferred(instr->context()); |
__ Move(InstanceofStub::right(), instr->function()); |
@@ -3696,7 +3687,7 @@ void LCodeGen::DoDeferredMathAbsTaggedHeapNumber(LMathAbs* instr) { |
// Input is negative. Reverse its sign. |
// Preserve the value of all registers. |
{ |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
// Registers were saved at the safepoint, so we can use |
// many scratch registers. |
@@ -4450,13 +4441,12 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) { |
} else { |
ASSERT(ToRegister(instr->context()).is(cp)); |
ASSERT(object_reg.is(r0)); |
- PushSafepointRegistersScope scope( |
- this, Safepoint::kWithRegistersAndDoubles); |
+ PushSafepointRegistersScope scope(this); |
__ Move(r1, to_map); |
bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE; |
TransitionElementsKindStub stub(isolate(), from_kind, to_kind, is_js_array); |
__ CallStub(&stub); |
- RecordSafepointWithRegistersAndDoubles( |
+ RecordSafepointWithRegisters( |
instr->pointer_map(), 0, Safepoint::kLazyDeopt); |
} |
__ bind(¬_applicable); |
@@ -4519,7 +4509,7 @@ void LCodeGen::DoDeferredStringCharCodeAt(LStringCharCodeAt* instr) { |
// contained in the register pointer map. |
__ mov(result, Operand::Zero()); |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
__ push(string); |
// Push the index as a smi. This is safe because of the checks in |
// DoStringCharCodeAt above. |
@@ -4582,7 +4572,7 @@ void LCodeGen::DoDeferredStringCharFromCode(LStringCharFromCode* instr) { |
// contained in the register pointer map. |
__ mov(result, Operand::Zero()); |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
__ SmiTag(char_code); |
__ push(char_code); |
CallRuntimeFromDeferred(Runtime::kCharFromCode, 1, instr, instr->context()); |
@@ -4715,7 +4705,7 @@ void LCodeGen::DoDeferredNumberTagIU(LInstruction* instr, |
__ mov(dst, Operand::Zero()); |
// Preserve the value of all registers. |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
// NumberTagI and NumberTagD use the context from the frame, rather than |
// the environment's HContext or HInlinedContext value. |
@@ -4780,7 +4770,7 @@ void LCodeGen::DoDeferredNumberTagD(LNumberTagD* instr) { |
Register reg = ToRegister(instr->result()); |
__ mov(reg, Operand::Zero()); |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
// NumberTagI and NumberTagD use the context from the frame, rather than |
// the environment's HContext or HInlinedContext value. |
// They only call Runtime::kAllocateHeapNumber. |
@@ -5144,7 +5134,7 @@ void LCodeGen::DoCheckValue(LCheckValue* instr) { |
void LCodeGen::DoDeferredInstanceMigration(LCheckMaps* instr, Register object) { |
{ |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
__ push(object); |
__ mov(cp, Operand::Zero()); |
__ CallRuntimeSaveDoubles(Runtime::kTryMigrateInstance); |
@@ -5361,7 +5351,7 @@ void LCodeGen::DoDeferredAllocate(LAllocate* instr) { |
// contained in the register pointer map. |
__ mov(result, Operand(Smi::FromInt(0))); |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
if (instr->size()->IsRegister()) { |
Register size = ToRegister(instr->size()); |
ASSERT(!size.is(result)); |
@@ -5650,7 +5640,7 @@ void LCodeGen::DoDummyUse(LDummyUse* instr) { |
void LCodeGen::DoDeferredStackCheck(LStackCheck* instr) { |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
LoadContextFromDeferred(instr->context()); |
__ CallRuntimeSaveDoubles(Runtime::kStackGuard); |
RecordSafepointWithLazyDeopt( |
@@ -5797,7 +5787,7 @@ void LCodeGen::DoDeferredLoadMutableDouble(LLoadFieldByIndex* instr, |
Register result, |
Register object, |
Register index) { |
- PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters); |
+ PushSafepointRegistersScope scope(this); |
__ Push(object); |
__ Push(index); |
__ mov(cp, Operand::Zero()); |