Index: src/full-codegen/arm64/full-codegen-arm64.cc |
diff --git a/src/full-codegen/arm64/full-codegen-arm64.cc b/src/full-codegen/arm64/full-codegen-arm64.cc |
index dc317087f5d20e88529918ffc655f908ebbd3d20..eb044dbfd9dd0a650fa31dc1fba10a8933a6dab8 100644 |
--- a/src/full-codegen/arm64/full-codegen-arm64.cc |
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc |
@@ -2461,8 +2461,8 @@ |
context()->DropAndPlug(1, x0); |
} |
-void FullCodeGenerator::EmitResolvePossiblyDirectEval(Call* expr) { |
- int arg_count = expr->arguments()->length(); |
+ |
+void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
ASM_LOCATION("FullCodeGenerator::EmitResolvePossiblyDirectEval"); |
// Prepare to push a copy of the first argument or undefined if it doesn't |
// exist. |
@@ -2476,8 +2476,8 @@ |
// Prepare to push the language mode. |
__ Mov(x11, Smi::FromInt(language_mode())); |
- // Prepare to push the source position of the eval call. |
- __ Mov(x12, Smi::FromInt(expr->position())); |
+ // Prepare to push the start position of the scope the calls resides in. |
+ __ Mov(x12, Smi::FromInt(scope()->start_position())); |
// Push. |
__ Push(x9, x10, x11, x12); |
@@ -2530,7 +2530,7 @@ |
void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
ASM_LOCATION("FullCodeGenerator::EmitPossiblyEvalCall"); |
- // 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(); |
@@ -2547,7 +2547,7 @@ |
// resolve eval. |
__ Peek(x10, (arg_count + 1) * kPointerSize); |
__ Push(x10); |
- EmitResolvePossiblyDirectEval(expr); |
+ EmitResolvePossiblyDirectEval(arg_count); |
// Touch up the stack with the resolved function. |
__ Poke(x0, (arg_count + 1) * kPointerSize); |