Index: src/full-codegen/x87/full-codegen-x87.cc |
diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc |
index f48479b3edfbd6eda3a8767c8f1fd85f5e3c0a3c..a44a1e5494d9f54b5adae76829a4e8b390e855a9 100644 |
--- a/src/full-codegen/x87/full-codegen-x87.cc |
+++ b/src/full-codegen/x87/full-codegen-x87.cc |
@@ -2453,8 +2453,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)); |
@@ -2471,6 +2471,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); |
} |
@@ -2517,7 +2520,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(); |
@@ -2533,7 +2536,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); |