Index: src/full-codegen/mips64/full-codegen-mips64.cc |
diff --git a/src/full-codegen/mips64/full-codegen-mips64.cc b/src/full-codegen/mips64/full-codegen-mips64.cc |
index bb1ae8d689abf1ff72a16bd7a84163760910864b..b58ffd0a57eaf6b8413214562f539d446c001741 100644 |
--- a/src/full-codegen/mips64/full-codegen-mips64.cc |
+++ b/src/full-codegen/mips64/full-codegen-mips64.cc |
@@ -2567,8 +2567,8 @@ void FullCodeGenerator::EmitCall(Call* expr, ConvertReceiverMode mode) { |
context()->DropAndPlug(1, v0); |
} |
- |
-void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
+void FullCodeGenerator::EmitResolvePossiblyDirectEval(Call* expr) { |
+ int arg_count = expr->arguments()->length(); |
// a6: copy of the first argument or undefined if it doesn't exist. |
if (arg_count > 0) { |
__ ld(a6, MemOperand(sp, arg_count * kPointerSize)); |
@@ -2585,8 +2585,11 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
// a1: the start position of the scope the calls resides in. |
__ li(a1, Operand(Smi::FromInt(scope()->start_position()))); |
+ // a0: the source position of the eval call. |
+ __ li(a0, Operand(Smi::FromInt(expr->position()))); |
+ |
// Do the runtime call. |
- __ Push(a6, a5, a4, a1); |
+ __ Push(a6, a5, a4, a1, a0); |
__ CallRuntime(Runtime::kResolvePossiblyDirectEval); |
} |
@@ -2635,7 +2638,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(); |
@@ -2651,7 +2654,7 @@ void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
// resolve eval. |
__ ld(a1, MemOperand(sp, (arg_count + 1) * kPointerSize)); |
__ push(a1); |
- EmitResolvePossiblyDirectEval(arg_count); |
+ EmitResolvePossiblyDirectEval(expr); |
// Touch up the stack with the resolved function. |
__ sd(v0, MemOperand(sp, (arg_count + 1) * kPointerSize)); |