| Index: src/mips/lithium-codegen-mips.cc
 | 
| diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc
 | 
| index 34e1a8225d37a7a462cf35bd48b6968d0e511560..aa12cde0da51f70d2c42ec927e12357100b96db8 100644
 | 
| --- a/src/mips/lithium-codegen-mips.cc
 | 
| +++ b/src/mips/lithium-codegen-mips.cc
 | 
| @@ -4272,26 +4272,35 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object,
 | 
|    ASSERT(!source.is(a2));
 | 
|    ASSERT(!result.is(a2));
 | 
|  
 | 
| +  // 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) {
 | 
| -    __ lw(a2, FieldMemOperand(source, i));
 | 
| -    __ sw(a2, FieldMemOperand(result, current_offset + i));
 | 
| +    if (has_elements && i == JSObject::kElementsOffset) {
 | 
| +      __ Addu(a2, result, Operand(elements_offset));
 | 
| +    } else {
 | 
| +      __ lw(a2, FieldMemOperand(source, i));
 | 
| +    }
 | 
| +    __ sw(a2, FieldMemOperand(result, object_offset + i));
 | 
|    }
 | 
|  
 | 
|    // 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);
 | 
| @@ -4307,10 +4316,42 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object,
 | 
|        __ sw(a2, FieldMemOperand(result, total_offset));
 | 
|      }
 | 
|    }
 | 
| +
 | 
| +
 | 
| +  // 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) {
 | 
| +      __ lw(a2, FieldMemOperand(source, i));
 | 
| +      __ sw(a2, FieldMemOperand(result, elements_offset + i));
 | 
| +    }
 | 
| +  }
 | 
| +
 | 
| +  // 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);
 | 
| +      __ Addu(a2, result, Operand(*offset));
 | 
| +      __ sw(a2, FieldMemOperand(result, total_offset));
 | 
| +      __ LoadHeapObject(source, value_object);
 | 
| +      EmitDeepCopy(value_object, result, source, offset);
 | 
| +    } else if (value->IsHeapObject()) {
 | 
| +      __ LoadHeapObject(a2, Handle<HeapObject>::cast(value));
 | 
| +      __ sw(a2, FieldMemOperand(result, total_offset));
 | 
| +    } else {
 | 
| +      __ li(a2, Operand(value));
 | 
| +      __ sw(a2, FieldMemOperand(result, total_offset));
 | 
| +    }
 | 
| +  }
 | 
|  }
 | 
|  
 | 
|  
 | 
| -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
 | 
| @@ -4332,7 +4373,7 @@ void LCodeGen::DoObjectLiteralFast(LObjectLiteralFast* instr) {
 | 
|  }
 | 
|  
 | 
|  
 | 
| -void LCodeGen::DoObjectLiteralGeneric(LObjectLiteralGeneric* instr) {
 | 
| +void LCodeGen::DoObjectLiteral(LObjectLiteral* instr) {
 | 
|    ASSERT(ToRegister(instr->result()).is(v0));
 | 
|    Handle<FixedArray> literals(instr->environment()->closure()->literals());
 | 
|    Handle<FixedArray> constant_properties =
 | 
| 
 |