| Index: src/full-codegen/x64/full-codegen-x64.cc
|
| diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc
|
| index f4880c4c49bb9a157a012dc8fc885550640837b8..86e339f261549a156e099a2de399f9c6e458e2d8 100644
|
| --- a/src/full-codegen/x64/full-codegen-x64.cc
|
| +++ b/src/full-codegen/x64/full-codegen-x64.cc
|
| @@ -2449,8 +2449,8 @@
|
| context()->DropAndPlug(1, rax);
|
| }
|
|
|
| -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(rsp, arg_count * kPointerSize));
|
| @@ -2464,8 +2464,8 @@
|
| // Push the language mode.
|
| __ Push(Smi::FromInt(language_mode()));
|
|
|
| - // Push the source position of the eval call.
|
| - __ Push(Smi::FromInt(expr->position()));
|
| + // Push the start position of the scope the calls resides in.
|
| + __ Push(Smi::FromInt(scope()->start_position()));
|
|
|
| // Do the runtime call.
|
| __ CallRuntime(Runtime::kResolvePossiblyDirectEval);
|
| @@ -2514,7 +2514,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();
|
| @@ -2529,7 +2529,7 @@
|
| // Push a copy of the function (found below the arguments) and resolve
|
| // eval.
|
| __ Push(Operand(rsp, (arg_count + 1) * kPointerSize));
|
| - EmitResolvePossiblyDirectEval(expr);
|
| + EmitResolvePossiblyDirectEval(arg_count);
|
|
|
| // Touch up the callee.
|
| __ movp(Operand(rsp, (arg_count + 1) * kPointerSize), rax);
|
|
|