| Index: src/full-codegen/ia32/full-codegen-ia32.cc
|
| diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc
|
| index ab6afd4e0ba21a799b223bf1af19d42d75c31d58..4a09fdb396ddb0a598b073530948cdf6d5ce9bb3 100644
|
| --- a/src/full-codegen/ia32/full-codegen-ia32.cc
|
| +++ b/src/full-codegen/ia32/full-codegen-ia32.cc
|
| @@ -2460,8 +2460,8 @@
|
| context()->DropAndPlug(1, eax);
|
| }
|
|
|
| -void FullCodeGenerator::EmitResolvePossiblyDirectEval(Call* expr) {
|
| - int arg_count = expr->arguments()->length();
|
| +
|
| +void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
| // Push copy of the first argument or undefined if it doesn't exist.
|
| if (arg_count > 0) {
|
| __ push(Operand(esp, arg_count * kPointerSize));
|
| @@ -2475,8 +2475,8 @@
|
| // Push the language mode.
|
| __ push(Immediate(Smi::FromInt(language_mode())));
|
|
|
| - // Push the source position of the eval call.
|
| - __ push(Immediate(Smi::FromInt(expr->position())));
|
| + // Push the start position of the scope the calls resides in.
|
| + __ push(Immediate(Smi::FromInt(scope()->start_position())));
|
|
|
| // Do the runtime call.
|
| __ CallRuntime(Runtime::kResolvePossiblyDirectEval);
|
| @@ -2524,7 +2524,7 @@
|
|
|
|
|
| void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) {
|
| - // In a call to eval, we first call Runtime_ResolvePossiblyDirectEval
|
| + // In a call to eval, we first call RuntimeHidden_ResolvePossiblyDirectEval
|
| // to resolve the function we need to call. Then we call the resolved
|
| // function using the given arguments.
|
| ZoneList<Expression*>* args = expr->arguments();
|
| @@ -2540,7 +2540,7 @@
|
| // Push a copy of the function (found below the arguments) and
|
| // resolve eval.
|
| __ push(Operand(esp, (arg_count + 1) * kPointerSize));
|
| - EmitResolvePossiblyDirectEval(expr);
|
| + EmitResolvePossiblyDirectEval(arg_count);
|
|
|
| // Touch up the stack with the resolved function.
|
| __ mov(Operand(esp, (arg_count + 1) * kPointerSize), eax);
|
|
|