Chromium Code Reviews| Index: src/x64/full-codegen-x64.cc |
| diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
| index 521b026c78833e54e8a9c812e2f8b685ace56533..da7d8cf8d89900e0c8cd3034ebe3f7c17f5fb293 100644 |
| --- a/src/x64/full-codegen-x64.cc |
| +++ b/src/x64/full-codegen-x64.cc |
| @@ -2429,16 +2429,8 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr, |
| void FullCodeGenerator::EmitAssignment(Expression* expr) { |
| 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(); |
| - if (prop != NULL) { |
| - assign_type = (prop->key()->IsPropertyName()) |
| - ? NAMED_PROPERTY |
| - : KEYED_PROPERTY; |
| - } |
| + LhsKind assign_type = GetAssignType(prop); |
| switch (assign_type) { |
| case VARIABLE: { |
| @@ -2457,6 +2449,43 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { |
| CallStoreIC(); |
| break; |
| } |
| + case NAMED_SUPER_PROPERTY: { |
| + __ Push(rax); |
| + VisitForStackValue(prop->obj()->AsSuperReference()->this_var()); |
| + EmitLoadHomeObject(prop->obj()->AsSuperReference()); |
| + // stack: value, this; rax: home_object |
| + Register scratch = rcx; |
| + Register scratch2 = rdx; |
| + __ Move(scratch, result_register()); // home_object |
| + __ movp(scratch2, MemOperand(rsp, kPointerSize)); // value |
|
Igor Sheludko
2014/10/13 11:39:07
And here.
Dmitry Lomov (no reviews)
2014/10/13 12:39:51
Done.
|
| + __ movp(rax, MemOperand(rsp, 0)); // this |
| + __ movp(MemOperand(rsp, kPointerSize), rax); // this |
| + __ movp(MemOperand(rsp, 0), scratch); // home_object |
| + __ Move(rax, scratch2); |
| + // stack: this, home_object; rax: value |
| + EmitNamedSuperPropertyStore(prop); |
| + break; |
| + } |
| + case KEYED_SUPER_PROPERTY: { |
| + __ Push(rax); |
| + VisitForStackValue(prop->obj()->AsSuperReference()->this_var()); |
| + EmitLoadHomeObject(prop->obj()->AsSuperReference()); |
| + __ Push(result_register()); |
| + VisitForAccumulatorValue(prop->key()); |
| + Register scratch = rcx; |
| + Register scratch2 = rdx; |
| + __ movp(scratch2, MemOperand(rsp, 2 * kPointerSize)); // value |
| + // stack: value, this, home_object; rax: key, rdx: value |
| + __ movp(scratch, MemOperand(rsp, kPointerSize)); // this |
| + __ movp(MemOperand(rsp, 2 * kPointerSize), scratch); |
| + __ movp(scratch, MemOperand(rsp, 0)); // home_object |
| + __ movp(MemOperand(rsp, kPointerSize), scratch); |
| + __ movp(MemOperand(rsp, 0), rax); |
| + __ Move(rax, scratch2); |
| + // stack: this, home_object, key; rax: value. |
| + EmitKeyedSuperPropertyStore(prop); |
| + break; |
| + } |
| case KEYED_PROPERTY: { |
| __ Push(rax); // Preserve value. |
| VisitForStackValue(prop->obj()); |