| Index: src/x64/lithium-codegen-x64.cc
|
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
|
| index ff8aeefe2c73d4ed19bb5cc1417232ee3c14db2a..8ce9df71308366884800b63890ac34907eda41aa 100644
|
| --- a/src/x64/lithium-codegen-x64.cc
|
| +++ b/src/x64/lithium-codegen-x64.cc
|
| @@ -3976,26 +3976,35 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object,
|
| ASSERT(!source.is(rcx));
|
| ASSERT(!result.is(rcx));
|
|
|
| + // Only elements backing stores for non-COW arrays need to be copied.
|
| + Handle<FixedArrayBase> elements(object->elements());
|
| + bool has_elements = elements->length() > 0 &&
|
| + elements->map() != isolate()->heap()->fixed_cow_array_map();
|
| +
|
| // Increase the offset so that subsequent objects end up right after
|
| - // this one.
|
| - int current_offset = *offset;
|
| - int size = object->map()->instance_size();
|
| - *offset += size;
|
| + // this object and its backing store.
|
| + int object_offset = *offset;
|
| + int object_size = object->map()->instance_size();
|
| + int elements_offset = *offset + object_size;
|
| + int elements_size = has_elements ? elements->Size() : 0;
|
| + *offset += object_size + elements_size;
|
|
|
| // Copy object header.
|
| ASSERT(object->properties()->length() == 0);
|
| - ASSERT(object->elements()->length() == 0 ||
|
| - object->elements()->map() == isolate()->heap()->fixed_cow_array_map());
|
| int inobject_properties = object->map()->inobject_properties();
|
| - int header_size = size - inobject_properties * kPointerSize;
|
| + int header_size = object_size - inobject_properties * kPointerSize;
|
| for (int i = 0; i < header_size; i += kPointerSize) {
|
| - __ movq(rcx, FieldOperand(source, i));
|
| - __ movq(FieldOperand(result, current_offset + i), rcx);
|
| + if (has_elements && i == JSObject::kElementsOffset) {
|
| + __ lea(rcx, Operand(result, elements_offset));
|
| + } else {
|
| + __ movq(rcx, FieldOperand(source, i));
|
| + }
|
| + __ movq(FieldOperand(result, object_offset + i), rcx);
|
| }
|
|
|
| // Copy in-object properties.
|
| for (int i = 0; i < inobject_properties; i++) {
|
| - int total_offset = current_offset + object->GetInObjectPropertyOffset(i);
|
| + int total_offset = object_offset + object->GetInObjectPropertyOffset(i);
|
| Handle<Object> value = Handle<Object>(object->InObjectPropertyAt(i));
|
| if (value->IsJSObject()) {
|
| Handle<JSObject> value_object = Handle<JSObject>::cast(value);
|
| @@ -4011,10 +4020,41 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object,
|
| __ movq(FieldOperand(result, total_offset), rcx);
|
| }
|
| }
|
| +
|
| + // Copy elements backing store header.
|
| + ASSERT(!has_elements || elements->IsFixedArray());
|
| + if (has_elements) {
|
| + __ LoadHeapObject(source, elements);
|
| + for (int i = 0; i < FixedArray::kHeaderSize; i += kPointerSize) {
|
| + __ movq(rcx, FieldOperand(source, i));
|
| + __ movq(FieldOperand(result, elements_offset + i), rcx);
|
| + }
|
| + }
|
| +
|
| + // Copy elements backing store content.
|
| + ASSERT(!has_elements || elements->IsFixedArray());
|
| + int elements_length = has_elements ? elements->length() : 0;
|
| + for (int i = 0; i < elements_length; i++) {
|
| + int total_offset = elements_offset + FixedArray::OffsetOfElementAt(i);
|
| + Handle<Object> value = JSObject::GetElement(object, i);
|
| + if (value->IsJSObject()) {
|
| + Handle<JSObject> value_object = Handle<JSObject>::cast(value);
|
| + __ lea(rcx, Operand(result, *offset));
|
| + __ movq(FieldOperand(result, total_offset), rcx);
|
| + __ LoadHeapObject(source, value_object);
|
| + EmitDeepCopy(value_object, result, source, offset);
|
| + } else if (value->IsHeapObject()) {
|
| + __ LoadHeapObject(rcx, Handle<HeapObject>::cast(value));
|
| + __ movq(FieldOperand(result, total_offset), rcx);
|
| + } else {
|
| + __ movq(rcx, value, RelocInfo::NONE);
|
| + __ movq(FieldOperand(result, total_offset), rcx);
|
| + }
|
| + }
|
| }
|
|
|
|
|
| -void LCodeGen::DoObjectLiteralFast(LObjectLiteralFast* instr) {
|
| +void LCodeGen::DoFastLiteral(LFastLiteral* instr) {
|
| int size = instr->hydrogen()->total_size();
|
|
|
| // Allocate all objects that are part of the literal in one big
|
| @@ -4035,7 +4075,7 @@ void LCodeGen::DoObjectLiteralFast(LObjectLiteralFast* instr) {
|
| }
|
|
|
|
|
| -void LCodeGen::DoObjectLiteralGeneric(LObjectLiteralGeneric* instr) {
|
| +void LCodeGen::DoObjectLiteral(LObjectLiteral* instr) {
|
| Handle<FixedArray> literals(instr->environment()->closure()->literals());
|
| Handle<FixedArray> constant_properties =
|
| instr->hydrogen()->constant_properties();
|
|
|