X87: [es6] implement spread calls
port 74c381221c
(r27714)
original commit message:
[es6] implement spread calls
BUG=
Review URL: https://codereview.chromium.org/1085533002
Cr-Commit-Position: refs/heads/master@{#27777}
This commit is contained in:
parent
ea5d68a6ef
commit
13b722b666
@ -2992,6 +2992,21 @@ void FullCodeGenerator::EmitLoadSuperConstructor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void FullCodeGenerator::EmitInitializeThisAfterSuper(
|
||||||
|
SuperReference* super_ref) {
|
||||||
|
Variable* this_var = super_ref->this_var()->var();
|
||||||
|
GetVar(ecx, this_var);
|
||||||
|
__ cmp(ecx, isolate()->factory()->the_hole_value());
|
||||||
|
Label uninitialized_this;
|
||||||
|
__ j(equal, &uninitialized_this);
|
||||||
|
__ push(Immediate(this_var->name()));
|
||||||
|
__ CallRuntime(Runtime::kThrowReferenceError, 1);
|
||||||
|
__ bind(&uninitialized_this);
|
||||||
|
|
||||||
|
EmitVariableAssignment(this_var, Token::INIT_CONST);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void FullCodeGenerator::VisitCall(Call* expr) {
|
void FullCodeGenerator::VisitCall(Call* expr) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
// We want to verify that RecordJSReturnSite gets called on all paths
|
// We want to verify that RecordJSReturnSite gets called on all paths
|
||||||
@ -3206,17 +3221,7 @@ void FullCodeGenerator::EmitSuperConstructorCall(Call* expr) {
|
|||||||
|
|
||||||
RecordJSReturnSite(expr);
|
RecordJSReturnSite(expr);
|
||||||
|
|
||||||
SuperReference* super_ref = expr->expression()->AsSuperReference();
|
EmitInitializeThisAfterSuper(expr->expression()->AsSuperReference());
|
||||||
Variable* this_var = super_ref->this_var()->var();
|
|
||||||
GetVar(ecx, this_var);
|
|
||||||
__ cmp(ecx, isolate()->factory()->the_hole_value());
|
|
||||||
Label uninitialized_this;
|
|
||||||
__ j(equal, &uninitialized_this);
|
|
||||||
__ push(Immediate(this_var->name()));
|
|
||||||
__ CallRuntime(Runtime::kThrowReferenceError, 1);
|
|
||||||
__ bind(&uninitialized_this);
|
|
||||||
|
|
||||||
EmitVariableAssignment(this_var, Token::INIT_CONST);
|
|
||||||
context()->Plug(eax);
|
context()->Plug(eax);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4517,26 +4522,79 @@ void FullCodeGenerator::EmitDebugIsActive(CallRuntime* expr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void FullCodeGenerator::EmitCallSuperWithSpread(CallRuntime* expr) {
|
||||||
|
// Assert: expr == CallRuntime("ReflectConstruct")
|
||||||
|
CallRuntime* call = expr->arguments()->at(0)->AsCallRuntime();
|
||||||
|
ZoneList<Expression*>* args = call->arguments();
|
||||||
|
DCHECK_EQ(3, args->length());
|
||||||
|
|
||||||
|
SuperReference* super_reference = args->at(0)->AsSuperReference();
|
||||||
|
|
||||||
|
// Load ReflectConstruct function
|
||||||
|
EmitLoadJSRuntimeFunction(call);
|
||||||
|
|
||||||
|
// Push the target function under the receiver
|
||||||
|
__ push(Operand(esp, 0));
|
||||||
|
__ mov(Operand(esp, kPointerSize), eax);
|
||||||
|
|
||||||
|
// Push super
|
||||||
|
EmitLoadSuperConstructor();
|
||||||
|
__ Push(result_register());
|
||||||
|
|
||||||
|
// Push arguments array
|
||||||
|
VisitForStackValue(args->at(1));
|
||||||
|
|
||||||
|
// Push NewTarget
|
||||||
|
DCHECK(args->at(2)->IsVariableProxy());
|
||||||
|
VisitForStackValue(args->at(2));
|
||||||
|
|
||||||
|
EmitCallJSRuntimeFunction(call);
|
||||||
|
|
||||||
|
// Restore context register.
|
||||||
|
__ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
|
||||||
|
context()->DropAndPlug(1, eax);
|
||||||
|
|
||||||
|
EmitInitializeThisAfterSuper(super_reference);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void FullCodeGenerator::EmitLoadJSRuntimeFunction(CallRuntime* expr) {
|
||||||
|
// Push the builtins object as receiver.
|
||||||
|
__ mov(eax, GlobalObjectOperand());
|
||||||
|
__ push(FieldOperand(eax, GlobalObject::kBuiltinsOffset));
|
||||||
|
|
||||||
|
// Load the function from the receiver.
|
||||||
|
__ mov(LoadDescriptor::ReceiverRegister(), Operand(esp, 0));
|
||||||
|
__ mov(LoadDescriptor::NameRegister(), Immediate(expr->name()));
|
||||||
|
if (FLAG_vector_ics) {
|
||||||
|
__ mov(VectorLoadICDescriptor::SlotRegister(),
|
||||||
|
Immediate(SmiFromSlot(expr->CallRuntimeFeedbackSlot())));
|
||||||
|
CallLoadIC(NOT_CONTEXTUAL);
|
||||||
|
} else {
|
||||||
|
CallLoadIC(NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void FullCodeGenerator::EmitCallJSRuntimeFunction(CallRuntime* expr) {
|
||||||
|
ZoneList<Expression*>* args = expr->arguments();
|
||||||
|
int arg_count = args->length();
|
||||||
|
|
||||||
|
// Record source position of the IC call.
|
||||||
|
SetSourcePosition(expr->position());
|
||||||
|
CallFunctionStub stub(isolate(), arg_count, NO_CALL_FUNCTION_FLAGS);
|
||||||
|
__ mov(edi, Operand(esp, (arg_count + 1) * kPointerSize));
|
||||||
|
__ CallStub(&stub);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {
|
void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {
|
||||||
ZoneList<Expression*>* args = expr->arguments();
|
ZoneList<Expression*>* args = expr->arguments();
|
||||||
int arg_count = args->length();
|
int arg_count = args->length();
|
||||||
|
|
||||||
if (expr->is_jsruntime()) {
|
if (expr->is_jsruntime()) {
|
||||||
Comment cmnt(masm_, "[ CallRuntime");
|
Comment cmnt(masm_, "[ CallRuntime");
|
||||||
// Push the builtins object as receiver.
|
EmitLoadJSRuntimeFunction(expr);
|
||||||
__ mov(eax, GlobalObjectOperand());
|
|
||||||
__ push(FieldOperand(eax, GlobalObject::kBuiltinsOffset));
|
|
||||||
|
|
||||||
// Load the function from the receiver.
|
|
||||||
__ mov(LoadDescriptor::ReceiverRegister(), Operand(esp, 0));
|
|
||||||
__ mov(LoadDescriptor::NameRegister(), Immediate(expr->name()));
|
|
||||||
if (FLAG_vector_ics) {
|
|
||||||
__ mov(VectorLoadICDescriptor::SlotRegister(),
|
|
||||||
Immediate(SmiFromSlot(expr->CallRuntimeFeedbackSlot())));
|
|
||||||
CallLoadIC(NOT_CONTEXTUAL);
|
|
||||||
} else {
|
|
||||||
CallLoadIC(NOT_CONTEXTUAL, expr->CallRuntimeFeedbackId());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Push the target function under the receiver.
|
// Push the target function under the receiver.
|
||||||
__ push(Operand(esp, 0));
|
__ push(Operand(esp, 0));
|
||||||
@ -4547,11 +4605,8 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {
|
|||||||
VisitForStackValue(args->at(i));
|
VisitForStackValue(args->at(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Record source position of the IC call.
|
EmitCallJSRuntimeFunction(expr);
|
||||||
SetSourcePosition(expr->position());
|
|
||||||
CallFunctionStub stub(isolate(), arg_count, NO_CALL_FUNCTION_FLAGS);
|
|
||||||
__ mov(edi, Operand(esp, (arg_count + 1) * kPointerSize));
|
|
||||||
__ CallStub(&stub);
|
|
||||||
// Restore context register.
|
// Restore context register.
|
||||||
__ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
|
__ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
|
||||||
context()->DropAndPlug(1, eax);
|
context()->DropAndPlug(1, eax);
|
||||||
|
Loading…
Reference in New Issue
Block a user