Chromium Code Reviews| 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 7148d47e1cdf565b5e9a734ed3ddad2b0d7afdfb..d615bec9622039e38dbede30ef6640eaca1f1ec9 100644 |
| --- a/src/full-codegen/ia32/full-codegen-ia32.cc |
| +++ b/src/full-codegen/ia32/full-codegen-ia32.cc |
| @@ -2550,8 +2550,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)); |
| @@ -2566,7 +2566,7 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
| __ push(Immediate(Smi::FromInt(language_mode()))); |
| // Push the start position of the scope the calls resides in. |
| - __ push(Immediate(Smi::FromInt(scope()->start_position()))); |
| + __ push(Immediate(Smi::FromInt(expr->position()))); |
| // Do the runtime call. |
| __ CallRuntime(Runtime::kResolvePossiblyDirectEval); |
| @@ -2614,7 +2614,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 |
|
Michael Starzinger
2016/04/05 09:56:49
nit: Nice catch. Would you be willing to port it t
|
| // to resolve the function we need to call. Then we call the resolved |
| // function using the given arguments. |
| ZoneList<Expression*>* args = expr->arguments(); |
| @@ -2630,7 +2630,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); |