X87: Support for super assignments in for..in.

port r24560.

original commit message:
  Support for super assignments in for..in.

BUG=
R=weiliang.lin@intel.com

Review URL: https://codereview.chromium.org/653823002

Patch from Chunyang Dai <chunyang.dai@intel.com>.

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24572 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent d9cda16c
...@@ -2417,16 +2417,8 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr, ...@@ -2417,16 +2417,8 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr,
void FullCodeGenerator::EmitAssignment(Expression* expr) { void FullCodeGenerator::EmitAssignment(Expression* expr) {
DCHECK(expr->IsValidReferenceExpression()); DCHECK(expr->IsValidReferenceExpression());
// Left-hand side can only be a property, a global or a (parameter or local)
// slot.
enum LhsKind { VARIABLE, NAMED_PROPERTY, KEYED_PROPERTY };
LhsKind assign_type = VARIABLE;
Property* prop = expr->AsProperty(); Property* prop = expr->AsProperty();
if (prop != NULL) { LhsKind assign_type = GetAssignType(prop);
assign_type = (prop->key()->IsPropertyName())
? NAMED_PROPERTY
: KEYED_PROPERTY;
}
switch (assign_type) { switch (assign_type) {
case VARIABLE: { case VARIABLE: {
...@@ -2445,6 +2437,42 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { ...@@ -2445,6 +2437,42 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) {
CallStoreIC(); CallStoreIC();
break; break;
} }
case NAMED_SUPER_PROPERTY: {
__ push(eax);
VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(prop->obj()->AsSuperReference());
// stack: value, this; eax: home_object
Register scratch = ecx;
Register scratch2 = edx;
__ mov(scratch, result_register()); // home_object
__ mov(eax, MemOperand(esp, kPointerSize)); // value
__ mov(scratch2, MemOperand(esp, 0)); // this
__ mov(MemOperand(esp, kPointerSize), scratch2); // this
__ mov(MemOperand(esp, 0), scratch); // home_object
// stack: this, home_object. eax: value
EmitNamedSuperPropertyStore(prop);
break;
}
case KEYED_SUPER_PROPERTY: {
__ push(eax);
VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(prop->obj()->AsSuperReference());
__ push(result_register());
VisitForAccumulatorValue(prop->key());
Register scratch = ecx;
Register scratch2 = edx;
__ mov(scratch2, MemOperand(esp, 2 * kPointerSize)); // value
// stack: value, this, home_object; eax: key, edx: value
__ mov(scratch, MemOperand(esp, kPointerSize)); // this
__ mov(MemOperand(esp, 2 * kPointerSize), scratch);
__ mov(scratch, MemOperand(esp, 0)); // home_object
__ mov(MemOperand(esp, kPointerSize), scratch);
__ mov(MemOperand(esp, 0), eax);
__ mov(eax, scratch2);
// stack: this, home_object, key; eax: value.
EmitKeyedSuperPropertyStore(prop);
break;
}
case KEYED_PROPERTY: { case KEYED_PROPERTY: {
__ push(eax); // Preserve value. __ push(eax); // Preserve value.
VisitForStackValue(prop->obj()); VisitForStackValue(prop->obj());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment