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 90a3d097285a55732158f21e1ffcef58cfe1845f..d4ccebc1d6327d59cf6a834983ec31f0ecc9369b 100644 |
--- a/src/full-codegen/arm64/full-codegen-arm64.cc |
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc |
@@ -2744,89 +2744,42 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) { |
} |
-void FullCodeGenerator::VisitCall(Call* expr) { |
-#ifdef DEBUG |
- // We want to verify that RecordJSReturnSite gets called on all paths |
- // through this function. Avoid early returns. |
- expr->return_is_recorded_ = false; |
-#endif |
- |
- Comment cmnt(masm_, "[ Call"); |
- Expression* callee = expr->expression(); |
- Call::CallType call_type = expr->GetCallType(isolate()); |
- |
- if (call_type == Call::POSSIBLY_EVAL_CALL) { |
- // 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(); |
- int arg_count = args->length(); |
+void FullCodeGenerator::EmitPossiblyEvalCall(Call* expr) { |
+ // 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(); |
+ int arg_count = args->length(); |
- PushCalleeAndWithBaseObject(expr); |
+ PushCalleeAndWithBaseObject(expr); |
- // Push the arguments. |
- for (int i = 0; i < arg_count; i++) { |
- VisitForStackValue(args->at(i)); |
- } |
- |
- // Push a copy of the function (found below the arguments) and |
- // resolve eval. |
- __ Peek(x10, (arg_count + 1) * kPointerSize); |
- __ Push(x10); |
- EmitResolvePossiblyDirectEval(arg_count); |
+ // Push the arguments. |
+ for (int i = 0; i < arg_count; i++) { |
+ VisitForStackValue(args->at(i)); |
+ } |
- // Touch up the stack with the resolved function. |
- __ Poke(x0, (arg_count + 1) * kPointerSize); |
+ // Push a copy of the function (found below the arguments) and |
+ // resolve eval. |
+ __ Peek(x10, (arg_count + 1) * kPointerSize); |
+ __ Push(x10); |
+ EmitResolvePossiblyDirectEval(arg_count); |
- PrepareForBailoutForId(expr->EvalId(), NO_REGISTERS); |
+ // Touch up the stack with the resolved function. |
+ __ Poke(x0, (arg_count + 1) * kPointerSize); |
- // Record source position for debugger. |
- SetCallPosition(expr, arg_count); |
+ PrepareForBailoutForId(expr->EvalId(), NO_REGISTERS); |
- // Call the evaluated function. |
- CallFunctionStub stub(isolate(), arg_count, NO_CALL_FUNCTION_FLAGS); |
- __ Peek(x1, (arg_count + 1) * kXRegSize); |
- __ CallStub(&stub); |
- RecordJSReturnSite(expr); |
- // Restore context register. |
- __ Ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
- context()->DropAndPlug(1, x0); |
- |
- } else if (call_type == Call::GLOBAL_CALL) { |
- EmitCallWithLoadIC(expr); |
- |
- } else if (call_type == Call::LOOKUP_SLOT_CALL) { |
- // Call to a lookup slot (dynamically introduced variable). |
- PushCalleeAndWithBaseObject(expr); |
- EmitCall(expr); |
- } else if (call_type == Call::NAMED_PROPERTY_CALL) { |
- Property* property = callee->AsProperty(); |
- VisitForStackValue(property->obj()); |
- EmitCallWithLoadIC(expr); |
- } else if (call_type == Call::KEYED_PROPERTY_CALL) { |
- Property* property = callee->AsProperty(); |
- VisitForStackValue(property->obj()); |
- EmitKeyedCallWithLoadIC(expr, property->key()); |
- } else if (call_type == Call::NAMED_SUPER_PROPERTY_CALL) { |
- EmitSuperCallWithLoadIC(expr); |
- } else if (call_type == Call::KEYED_SUPER_PROPERTY_CALL) { |
- EmitKeyedSuperCallWithLoadIC(expr); |
- } else if (call_type == Call::SUPER_CALL) { |
- EmitSuperConstructorCall(expr); |
- } else { |
- DCHECK(call_type == Call::OTHER_CALL); |
- // Call to an arbitrary expression not handled specially above. |
- VisitForStackValue(callee); |
- __ LoadRoot(x1, Heap::kUndefinedValueRootIndex); |
- __ Push(x1); |
- // Emit function call. |
- EmitCall(expr); |
- } |
+ // Record source position for debugger. |
+ SetCallPosition(expr, arg_count); |
-#ifdef DEBUG |
- // RecordJSReturnSite should have been called. |
- DCHECK(expr->return_is_recorded_); |
-#endif |
+ // Call the evaluated function. |
+ CallFunctionStub stub(isolate(), arg_count, NO_CALL_FUNCTION_FLAGS); |
+ __ Peek(x1, (arg_count + 1) * kXRegSize); |
+ __ CallStub(&stub); |
+ RecordJSReturnSite(expr); |
+ // Restore context register. |
+ __ Ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
+ context()->DropAndPlug(1, x0); |
} |