Index: src/full-codegen/arm/full-codegen-arm.cc |
diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc |
index 8dcb3023e1032c3aa470ee534cf476feae473a60..536123b282e1c612dbe0a0e24c5ff4a4676f82b4 100644 |
--- a/src/full-codegen/arm/full-codegen-arm.cc |
+++ b/src/full-codegen/arm/full-codegen-arm.cc |
@@ -2562,8 +2562,8 @@ void FullCodeGenerator::EmitCall(Call* expr, ConvertReceiverMode mode) { |
context()->DropAndPlug(1, r0); |
} |
- |
-void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
+void FullCodeGenerator::EmitResolvePossiblyDirectEval(Call* expr) { |
+ int arg_count = expr->arguments()->length(); |
// r4: copy of the first argument or undefined if it doesn't exist. |
if (arg_count > 0) { |
__ ldr(r4, MemOperand(sp, arg_count * kPointerSize)); |
@@ -2580,8 +2580,11 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
// r1: the start position of the scope the calls resides in. |
__ mov(r1, Operand(Smi::FromInt(scope()->start_position()))); |
+ // r0: the source position of the eval call. |
+ __ mov(r0, Operand(Smi::FromInt(expr->position()))); |
+ |
// Do the runtime call. |
- __ Push(r4, r3, r2, r1); |
+ __ Push(r4, r3, r2, r1, r0); |
__ CallRuntime(Runtime::kResolvePossiblyDirectEval); |
} |
@@ -2630,7 +2633,7 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) { |
void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
// In a call to eval, we first call |
- // RuntimeHidden_asResolvePossiblyDirectEval to resolve the function we need |
+ // Runtime_ResolvePossiblyDirectEval to resolve the function we need |
// to call. Then we call the resolved function using the given arguments. |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
@@ -2646,7 +2649,7 @@ void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
// resolve eval. |
__ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize)); |
__ push(r1); |
- EmitResolvePossiblyDirectEval(arg_count); |
+ EmitResolvePossiblyDirectEval(expr); |
// Touch up the stack with the resolved function. |
__ str(r0, MemOperand(sp, (arg_count + 1) * kPointerSize)); |