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 3d6c8e22877b2988af080ba219c5d183a5c58be8..f7538ac1d47deb42762c299e33fc1b458012e22c 100644 |
--- a/src/full-codegen/ia32/full-codegen-ia32.cc |
+++ b/src/full-codegen/ia32/full-codegen-ia32.cc |
@@ -2461,8 +2461,8 @@ void FullCodeGenerator::EmitCall(Call* expr, ConvertReceiverMode mode) { |
context()->DropAndPlug(1, eax); |
} |
- |
-void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
+void FullCodeGenerator::EmitResolvePossiblyDirectEval(Call* expr) { |
+ int arg_count = expr->arguments()->length(); |
// Push copy of the first argument or undefined if it doesn't exist. |
if (arg_count > 0) { |
__ push(Operand(esp, arg_count * kPointerSize)); |
@@ -2479,6 +2479,9 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
// Push the start position of the scope the calls resides in. |
__ push(Immediate(Smi::FromInt(scope()->start_position()))); |
+ // Push the source position of the eval call. |
+ __ push(Immediate(Smi::FromInt(expr->position()))); |
+ |
// Do the runtime call. |
__ CallRuntime(Runtime::kResolvePossiblyDirectEval); |
} |
@@ -2525,7 +2528,7 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) { |
void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
- // In a call to eval, we first call RuntimeHidden_ResolvePossiblyDirectEval |
+ // In a call to eval, we first call 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(); |
@@ -2541,7 +2544,7 @@ void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
// Push a copy of the function (found below the arguments) and |
// resolve eval. |
__ push(Operand(esp, (arg_count + 1) * kPointerSize)); |
- EmitResolvePossiblyDirectEval(arg_count); |
+ EmitResolvePossiblyDirectEval(expr); |
// Touch up the stack with the resolved function. |
__ mov(Operand(esp, (arg_count + 1) * kPointerSize), eax); |