Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 0673d94ecacdb40e4e8f5a0bd37214f7eea3b171..895f2cf7c4ecc36f85f5a1d21d274151aa459632 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -2070,10 +2070,17 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
// result = receiver[f](arg); |
__ bind(&l_call); |
- Handle<Code> ic = isolate()->stub_cache()->ComputeKeyedCallInitialize(1); |
- CallIC(ic); |
+ __ movp(rdx, Operand(rsp, kPointerSize)); |
+ __ movp(rax, Operand(rsp, 2 * kPointerSize)); |
+ Handle<Code> ic = isolate()->builtins()->KeyedLoadIC_Initialize(); |
+ CallIC(ic, NOT_CONTEXTUAL, TypeFeedbackId::None()); |
+ __ movp(rdi, rax); |
+ __ movp(Operand(rsp, 2 * kPointerSize), rdi); |
+ CallFunctionStub stub(1, CALL_AS_METHOD); |
+ __ CallStub(&stub); |
+ |
__ movp(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); |
- __ Drop(1); // The key is still on the stack; drop it. |
+ __ Drop(1); // The function is still on the stack; drop it. |
// if (!result.done) goto l_try; |
__ bind(&l_loop); |
@@ -2538,63 +2545,95 @@ void FullCodeGenerator::CallIC(Handle<Code> code, |
} |
-void FullCodeGenerator::EmitCallWithIC(Call* expr, |
- Handle<Object> name, |
- ContextualMode mode) { |
- // Code common for calls using the IC. |
+// Code common for calls using the IC. |
+void FullCodeGenerator::EmitCallWithIC(Call* expr) { |
+ Expression* callee = expr->expression(); |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
+ |
+ CallFunctionFlags flags; |
+ // Get the target function; |
+ if (callee->IsVariableProxy()) { |
+ { StackValueContext context(this); |
+ EmitVariableLoad(callee->AsVariableProxy()); |
+ PrepareForBailout(callee, NO_REGISTERS); |
+ } |
+ // Push undefined as receiver. This is patched in the method prologue if it |
+ // is a classic mode method. |
+ __ Push(isolate()->factory()->undefined_value()); |
+ flags = NO_CALL_FUNCTION_FLAGS; |
+ } else { |
+ // Load the function from the receiver. |
+ ASSERT(callee->IsProperty()); |
+ __ movp(rax, Operand(rsp, 0)); |
+ EmitNamedPropertyLoad(callee->AsProperty()); |
+ PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG); |
+ // Push the target function under the receiver. |
+ __ push(Operand(rsp, 0)); |
+ __ movp(Operand(rsp, kPointerSize), rax); |
+ flags = CALL_AS_METHOD; |
+ } |
+ |
+ // Load the arguments. |
{ PreservePositionScope scope(masm()->positions_recorder()); |
for (int i = 0; i < arg_count; i++) { |
VisitForStackValue(args->at(i)); |
} |
- __ Move(rcx, name); |
} |
+ |
// Record source position for debugger. |
SetSourcePosition(expr->position()); |
- // Call the IC initialization code. |
- Handle<Code> ic = isolate()->stub_cache()->ComputeCallInitialize(arg_count); |
- TypeFeedbackId ast_id = mode == CONTEXTUAL |
- ? TypeFeedbackId::None() |
- : expr->CallFeedbackId(); |
- CallIC(ic, mode, ast_id); |
+ CallFunctionStub stub(arg_count, flags); |
+ __ movp(rdi, Operand(rsp, (arg_count + 1) * kPointerSize)); |
+ __ CallStub(&stub); |
+ |
RecordJSReturnSite(expr); |
+ |
// Restore context register. |
__ movp(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); |
- context()->Plug(rax); |
+ |
+ context()->DropAndPlug(1, rax); |
} |
+// Common code for calls using the IC. |
void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, |
Expression* key) { |
// Load the key. |
VisitForAccumulatorValue(key); |
- // Swap the name of the function and the receiver on the stack to follow |
- // the calling convention for call ICs. |
- __ pop(rcx); |
- __ push(rax); |
- __ push(rcx); |
- |
- // Load the arguments. |
+ Expression* callee = expr->expression(); |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
+ |
+ // Load the function from the receiver. |
+ ASSERT(callee->IsProperty()); |
+ __ movp(rdx, Operand(rsp, 0)); |
+ EmitKeyedPropertyLoad(callee->AsProperty()); |
+ PrepareForBailoutForId(callee->AsProperty()->LoadId(), TOS_REG); |
+ |
+ // Push the target function under the receiver. |
+ __ push(Operand(rsp, 0)); |
+ __ movp(Operand(rsp, kPointerSize), rax); |
+ |
+ // Load the arguments. |
{ PreservePositionScope scope(masm()->positions_recorder()); |
for (int i = 0; i < arg_count; i++) { |
VisitForStackValue(args->at(i)); |
} |
} |
+ |
// Record source position for debugger. |
SetSourcePosition(expr->position()); |
- // Call the IC initialization code. |
- Handle<Code> ic = |
- isolate()->stub_cache()->ComputeKeyedCallInitialize(arg_count); |
- __ movp(rcx, Operand(rsp, (arg_count + 1) * kPointerSize)); // Key. |
- CallIC(ic, NOT_CONTEXTUAL, expr->CallFeedbackId()); |
+ CallFunctionStub stub(arg_count, CALL_AS_METHOD); |
+ __ movp(rdi, Operand(rsp, (arg_count + 1) * kPointerSize)); |
+ __ CallStub(&stub); |
+ |
RecordJSReturnSite(expr); |
// Restore context register. |
__ movp(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); |
- context()->DropAndPlug(1, rax); // Drop the key still on the stack. |
+ |
+ context()->DropAndPlug(1, rax); |
} |
@@ -2697,11 +2736,8 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
__ movp(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); |
context()->DropAndPlug(1, rax); |
} else if (call_type == Call::GLOBAL_CALL) { |
- // Call to a global variable. Push global object as receiver for the |
- // call IC lookup. |
- __ push(GlobalObjectOperand()); |
- VariableProxy* proxy = callee->AsVariableProxy(); |
- EmitCallWithIC(expr, proxy->name(), CONTEXTUAL); |
+ EmitCallWithIC(expr); |
+ |
} else if (call_type == Call::LOOKUP_SLOT_CALL) { |
// Call to a lookup slot (dynamically introduced variable). |
VariableProxy* proxy = callee->AsVariableProxy(); |
@@ -2744,9 +2780,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { |
VisitForStackValue(property->obj()); |
} |
if (property->key()->IsPropertyName()) { |
- EmitCallWithIC(expr, |
- property->key()->AsLiteral()->value(), |
- NOT_CONTEXTUAL); |
+ EmitCallWithIC(expr); |
} else { |
EmitKeyedCallWithIC(expr, property->key()); |
} |
@@ -4091,30 +4125,47 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) { |
Comment cmnt(masm_, "[ CallRuntime"); |
ZoneList<Expression*>* args = expr->arguments(); |
+ int arg_count = args->length(); |
if (expr->is_jsruntime()) { |
- // Prepare for calling JS runtime function. |
+ // Push the builtins object as receiver. |
__ movp(rax, GlobalObjectOperand()); |
__ push(FieldOperand(rax, GlobalObject::kBuiltinsOffset)); |
- } |
- |
- // Push the arguments ("left-to-right"). |
- int arg_count = args->length(); |
- for (int i = 0; i < arg_count; i++) { |
- VisitForStackValue(args->at(i)); |
- } |
- if (expr->is_jsruntime()) { |
- // Call the JS runtime function using a call IC. |
+ // Load the function from the receiver. |
+ __ movp(rax, Operand(rsp, 0)); |
__ Move(rcx, expr->name()); |
- Handle<Code> ic = isolate()->stub_cache()->ComputeCallInitialize(arg_count); |
- CallIC(ic, NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId()); |
+ CallLoadIC(NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId()); |
+ |
+ // Push the target function under the receiver. |
+ __ push(Operand(rsp, 0)); |
+ __ movp(Operand(rsp, kPointerSize), rax); |
+ |
+ // Push the arguments ("left-to-right"). |
+ for (int i = 0; i < arg_count; i++) { |
+ VisitForStackValue(args->at(i)); |
+ } |
+ |
+ // Record source position of the IC call. |
+ SetSourcePosition(expr->position()); |
+ CallFunctionStub stub(arg_count, NO_CALL_FUNCTION_FLAGS); |
+ __ movp(rdi, Operand(rsp, (arg_count + 1) * kPointerSize)); |
+ __ CallStub(&stub); |
+ |
// Restore context register. |
__ movp(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); |
+ context()->DropAndPlug(1, rax); |
+ |
} else { |
+ // Push the arguments ("left-to-right"). |
+ for (int i = 0; i < arg_count; i++) { |
+ VisitForStackValue(args->at(i)); |
+ } |
+ |
+ // Call the C runtime. |
__ CallRuntime(expr->function(), arg_count); |
+ context()->Plug(rax); |
} |
- context()->Plug(rax); |
} |