Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index f04015bd787b1473ab114accc318c2efa55064d0..1a55efa45cf22b898b58c59028b73ac0e4f01e09 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -1691,14 +1691,14 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr, |
// Code common for calls using the IC. |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
for (int i = 0; i < arg_count; i++) { |
VisitForStackValue(args->at(i)); |
} |
__ mov(r2, Operand(name)); |
} |
// Record source position for debugger. |
- SetSourcePosition(expr->position(), FORCED_POSITION); |
+ SetSourcePosition(expr->position()); |
// Call the IC initialization code. |
InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP; |
Handle<Code> ic = StubCache::ComputeCallInitialize(arg_count, in_loop); |
@@ -1724,13 +1724,13 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, |
// Code common for calls using the IC. |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
for (int i = 0; i < arg_count; i++) { |
VisitForStackValue(args->at(i)); |
} |
} |
// Record source position for debugger. |
- SetSourcePosition(expr->position(), FORCED_POSITION); |
+ SetSourcePosition(expr->position()); |
// Call the IC initialization code. |
InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP; |
Handle<Code> ic = StubCache::ComputeKeyedCallInitialize(arg_count, in_loop); |
@@ -1746,13 +1746,13 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr) { |
// Code common for calls using the call stub. |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
for (int i = 0; i < arg_count; i++) { |
VisitForStackValue(args->at(i)); |
} |
} |
// Record source position for debugger. |
- SetSourcePosition(expr->position(), FORCED_POSITION); |
+ SetSourcePosition(expr->position()); |
InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP; |
CallFunctionStub stub(arg_count, in_loop, RECEIVER_MIGHT_BE_VALUE); |
__ CallStub(&stub); |
@@ -1775,7 +1775,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
- { PreserveStatementPositionScope pos_scope(masm()->positions_recorder()); |
+ { PreservePositionScope pos_scope(masm()->positions_recorder()); |
VisitForStackValue(fun); |
__ LoadRoot(r2, Heap::kUndefinedValueRootIndex); |
__ push(r2); // Reserved receiver slot. |
@@ -1810,7 +1810,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
} |
// Record source position for debugger. |
- SetSourcePosition(expr->position(), FORCED_POSITION); |
+ SetSourcePosition(expr->position()); |
InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP; |
CallFunctionStub stub(arg_count, in_loop, RECEIVER_MIGHT_BE_VALUE); |
__ CallStub(&stub); |
@@ -1827,7 +1827,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
// Call to a lookup slot (dynamically introduced variable). |
Label slow, done; |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
// Generate code for loading from variables potentially shadowed |
// by eval-introduced variables. |
EmitDynamicLoadFromSlotFastCase(var->AsSlot(), |
@@ -1868,7 +1868,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
Literal* key = prop->key()->AsLiteral(); |
if (key != NULL && key->handle()->IsSymbol()) { |
// Call to a named property, use call IC. |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
VisitForStackValue(prop->obj()); |
} |
EmitCallWithIC(expr, key->handle(), RelocInfo::CODE_TARGET); |
@@ -1876,15 +1876,15 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
// Call to a keyed property. |
// For a synthetic property use keyed load IC followed by function call, |
// for a regular property use keyed CallIC. |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
VisitForStackValue(prop->obj()); |
} |
if (prop->is_synthetic()) { |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
VisitForAccumulatorValue(prop->key()); |
} |
// Record source code position for IC call. |
- SetSourcePosition(prop->position(), FORCED_POSITION); |
+ SetSourcePosition(prop->position()); |
__ pop(r1); // We do not need to keep the receiver. |
Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize)); |
@@ -1908,7 +1908,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
lit->set_try_full_codegen(true); |
} |
- { PreserveStatementPositionScope scope(masm()->positions_recorder()); |
+ { PreservePositionScope scope(masm()->positions_recorder()); |
VisitForStackValue(fun); |
} |
// Load global receiver object. |