Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index d2fd70f0aa8f4f931ef30015e839299228d7b6e0..60e21b7de046cafed97c190f86813263de7dafef 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -259,8 +259,9 @@ bool LCodeGen::GenerateDeferredCode() { |
for (int i = 0; !is_aborted() && i < deferred_.length(); i++) { |
LDeferredCode* code = deferred_[i]; |
- int pos = instructions_->at(code->instruction_index())->position(); |
- RecordAndUpdatePosition(pos); |
+ HValue* value = |
+ instructions_->at(code->instruction_index())->hydrogen_value(); |
+ RecordAndWritePosition(value->position()); |
Comment(";;; <@%d,#%d> " |
"-------------------- Deferred %s --------------------", |
@@ -685,8 +686,6 @@ void LCodeGen::CallCodeGeneric(Handle<Code> code, |
// Block literal pool emission to ensure nop indicating no inlined smi code |
// is in the correct position. |
Assembler::BlockConstPoolScope block_const_pool(masm()); |
- LPointerMap* pointers = instr->pointer_map(); |
- RecordPosition(pointers->position()); |
__ Call(code, mode, TypeFeedbackId::None(), al, storage_mode); |
RecordSafepointWithLazyDeopt(instr, safepoint_mode); |
@@ -704,9 +703,6 @@ void LCodeGen::CallRuntime(const Runtime::Function* function, |
LInstruction* instr, |
SaveFPRegsMode save_doubles) { |
ASSERT(instr != NULL); |
- LPointerMap* pointers = instr->pointer_map(); |
- ASSERT(pointers != NULL); |
- RecordPosition(pointers->position()); |
__ CallRuntime(function, num_arguments, save_doubles); |
@@ -964,7 +960,7 @@ void LCodeGen::RecordSafepoint(LPointerMap* pointers, |
void LCodeGen::RecordSafepoint(Safepoint::DeoptMode deopt_mode) { |
- LPointerMap empty_pointers(RelocInfo::kNoPosition, zone()); |
+ LPointerMap empty_pointers(zone()); |
RecordSafepoint(&empty_pointers, deopt_mode); |
} |
@@ -986,17 +982,10 @@ void LCodeGen::RecordSafepointWithRegistersAndDoubles( |
} |
-void LCodeGen::RecordPosition(int position) { |
+void LCodeGen::RecordAndWritePosition(int position) { |
if (position == RelocInfo::kNoPosition) return; |
masm()->positions_recorder()->RecordPosition(position); |
-} |
- |
- |
-void LCodeGen::RecordAndUpdatePosition(int position) { |
- if (position >= 0 && position != old_position_) { |
- masm()->positions_recorder()->RecordPosition(position); |
- old_position_ = position; |
- } |
+ masm()->positions_recorder()->WriteRecordedPositions(); |
} |
@@ -3507,7 +3496,6 @@ void LCodeGen::DoApplyArguments(LApplyArguments* instr) { |
__ bind(&invoke); |
ASSERT(instr->HasPointerMap()); |
LPointerMap* pointers = instr->pointer_map(); |
- RecordPosition(pointers->position()); |
SafepointGenerator safepoint_generator( |
this, pointers, Safepoint::kLazyDeopt); |
// The number of arguments is stored in receiver which is r0, as expected |
@@ -3597,7 +3585,6 @@ void LCodeGen::CallKnownFunction(Handle<JSFunction> function, |
dont_adapt_arguments || formal_parameter_count == arity; |
LPointerMap* pointers = instr->pointer_map(); |
- RecordPosition(pointers->position()); |
if (can_invoke_directly) { |
if (r1_state == R1_UNINITIALIZED) { |
@@ -4009,7 +3996,6 @@ void LCodeGen::DoInvokeFunction(LInvokeFunction* instr) { |
Handle<JSFunction> known_function = instr->hydrogen()->known_function(); |
if (known_function.is_null()) { |
LPointerMap* pointers = instr->pointer_map(); |
- RecordPosition(pointers->position()); |
SafepointGenerator generator(this, pointers, Safepoint::kLazyDeopt); |
ParameterCount count(instr->arity()); |
__ InvokeFunction(r1, count, CALL_FUNCTION, generator, CALL_AS_METHOD); |