Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 45e203993491a6eebc58afee89ef5264c1a6bff0..4308291e7bdb9f18f0b736512accb012a5203d56 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -6096,178 +6096,6 @@ void LCodeGen::DoArrayLiteral(LArrayLiteral* instr) { |
} |
-void LCodeGen::EmitDeepCopy(Handle<JSObject> object, |
- Register result, |
- Register source, |
- int* offset, |
- AllocationSiteMode mode) { |
- ASSERT(!source.is(ecx)); |
- ASSERT(!result.is(ecx)); |
- |
- bool create_allocation_site_info = mode == TRACK_ALLOCATION_SITE && |
- object->map()->CanTrackAllocationSite(); |
- |
- if (FLAG_debug_code) { |
- __ LoadHeapObject(ecx, object); |
- __ cmp(source, ecx); |
- __ Assert(equal, "Unexpected object literal boilerplate"); |
- __ mov(ecx, FieldOperand(source, HeapObject::kMapOffset)); |
- __ cmp(ecx, Handle<Map>(object->map())); |
- __ Assert(equal, "Unexpected boilerplate map"); |
- __ mov(ecx, FieldOperand(ecx, Map::kBitField2Offset)); |
- __ and_(ecx, Map::kElementsKindMask); |
- __ cmp(ecx, object->GetElementsKind() << Map::kElementsKindShift); |
- __ Assert(equal, "Unexpected boilerplate elements kind"); |
- } |
- |
- // 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 object and its backing store. |
- int object_offset = *offset; |
- int object_size = object->map()->instance_size(); |
- int elements_size = has_elements ? elements->Size() : 0; |
- int elements_offset = *offset + object_size; |
- if (create_allocation_site_info) { |
- elements_offset += AllocationSiteInfo::kSize; |
- *offset += AllocationSiteInfo::kSize; |
- } |
- |
- *offset += object_size + elements_size; |
- |
- // Copy object header. |
- ASSERT(object->properties()->length() == 0); |
- int inobject_properties = object->map()->inobject_properties(); |
- int header_size = object_size - inobject_properties * kPointerSize; |
- for (int i = 0; i < header_size; i += kPointerSize) { |
- if (has_elements && i == JSObject::kElementsOffset) { |
- __ lea(ecx, Operand(result, elements_offset)); |
- } else { |
- __ mov(ecx, FieldOperand(source, i)); |
- } |
- __ mov(FieldOperand(result, object_offset + i), ecx); |
- } |
- |
- // Copy in-object properties. |
- for (int i = 0; i < inobject_properties; i++) { |
- int total_offset = object_offset + object->GetInObjectPropertyOffset(i); |
- Handle<Object> value = Handle<Object>(object->InObjectPropertyAt(i), |
- isolate()); |
- if (value->IsJSObject()) { |
- Handle<JSObject> value_object = Handle<JSObject>::cast(value); |
- __ lea(ecx, Operand(result, *offset)); |
- __ mov(FieldOperand(result, total_offset), ecx); |
- __ LoadHeapObject(source, value_object); |
- EmitDeepCopy(value_object, result, source, offset, |
- DONT_TRACK_ALLOCATION_SITE); |
- } else if (value->IsHeapObject()) { |
- __ LoadHeapObject(ecx, Handle<HeapObject>::cast(value)); |
- __ mov(FieldOperand(result, total_offset), ecx); |
- } else { |
- __ mov(FieldOperand(result, total_offset), Immediate(value)); |
- } |
- } |
- |
- // Build Allocation Site Info if desired |
- if (create_allocation_site_info) { |
- __ mov(FieldOperand(result, object_size), |
- Immediate(Handle<Map>(isolate()->heap()-> |
- allocation_site_info_map()))); |
- __ mov(FieldOperand(result, object_size + kPointerSize), source); |
- } |
- |
- if (has_elements) { |
- // Copy elements backing store header. |
- __ LoadHeapObject(source, elements); |
- for (int i = 0; i < FixedArray::kHeaderSize; i += kPointerSize) { |
- __ mov(ecx, FieldOperand(source, i)); |
- __ mov(FieldOperand(result, elements_offset + i), ecx); |
- } |
- |
- // Copy elements backing store content. |
- int elements_length = elements->length(); |
- if (elements->IsFixedDoubleArray()) { |
- Handle<FixedDoubleArray> double_array = |
- Handle<FixedDoubleArray>::cast(elements); |
- for (int i = 0; i < elements_length; i++) { |
- int64_t value = double_array->get_representation(i); |
- int32_t value_low = static_cast<int32_t>(value & 0xFFFFFFFF); |
- int32_t value_high = static_cast<int32_t>(value >> 32); |
- int total_offset = |
- elements_offset + FixedDoubleArray::OffsetOfElementAt(i); |
- __ mov(FieldOperand(result, total_offset), Immediate(value_low)); |
- __ mov(FieldOperand(result, total_offset + 4), Immediate(value_high)); |
- } |
- } else if (elements->IsFixedArray()) { |
- Handle<FixedArray> fast_elements = Handle<FixedArray>::cast(elements); |
- for (int i = 0; i < elements_length; i++) { |
- int total_offset = elements_offset + FixedArray::OffsetOfElementAt(i); |
- Handle<Object> value(fast_elements->get(i), isolate()); |
- if (value->IsJSObject()) { |
- Handle<JSObject> value_object = Handle<JSObject>::cast(value); |
- __ lea(ecx, Operand(result, *offset)); |
- __ mov(FieldOperand(result, total_offset), ecx); |
- __ LoadHeapObject(source, value_object); |
- EmitDeepCopy(value_object, result, source, offset, |
- DONT_TRACK_ALLOCATION_SITE); |
- } else if (value->IsHeapObject()) { |
- __ LoadHeapObject(ecx, Handle<HeapObject>::cast(value)); |
- __ mov(FieldOperand(result, total_offset), ecx); |
- } else { |
- __ mov(FieldOperand(result, total_offset), Immediate(value)); |
- } |
- } |
- } else { |
- UNREACHABLE(); |
- } |
- } |
-} |
- |
- |
-void LCodeGen::DoFastLiteral(LFastLiteral* instr) { |
- ASSERT(ToRegister(instr->context()).is(esi)); |
- int size = instr->hydrogen()->total_size(); |
- ElementsKind boilerplate_elements_kind = |
- instr->hydrogen()->boilerplate()->GetElementsKind(); |
- |
- // Deopt if the literal boilerplate ElementsKind is of a type different than |
- // the expected one. The check isn't necessary if the boilerplate has already |
- // already been converted to TERMINAL_FAST_ELEMENTS_KIND. |
- if (CanTransitionToMoreGeneralFastElementsKind( |
- boilerplate_elements_kind, true)) { |
- __ LoadHeapObject(ebx, instr->hydrogen()->boilerplate()); |
- __ mov(ecx, FieldOperand(ebx, HeapObject::kMapOffset)); |
- // Load the map's "bit field 2". We only need the first byte, |
- // but the following masking takes care of that anyway. |
- __ mov(ecx, FieldOperand(ecx, Map::kBitField2Offset)); |
- // Retrieve elements_kind from bit field 2. |
- __ and_(ecx, Map::kElementsKindMask); |
- __ cmp(ecx, boilerplate_elements_kind << Map::kElementsKindShift); |
- DeoptimizeIf(not_equal, instr->environment()); |
- } |
- |
- // Allocate all objects that are part of the literal in one big |
- // allocation. This avoids multiple limit checks. |
- Label allocated, runtime_allocate; |
- __ Allocate(size, eax, ecx, edx, &runtime_allocate, TAG_OBJECT); |
- __ jmp(&allocated); |
- |
- __ bind(&runtime_allocate); |
- __ push(Immediate(Smi::FromInt(size))); |
- CallRuntime(Runtime::kAllocateInNewSpace, 1, instr); |
- |
- __ bind(&allocated); |
- int offset = 0; |
- __ LoadHeapObject(ebx, instr->hydrogen()->boilerplate()); |
- EmitDeepCopy(instr->hydrogen()->boilerplate(), eax, ebx, &offset, |
- instr->hydrogen()->allocation_site_mode()); |
- ASSERT_EQ(size, offset); |
-} |
- |
- |
void LCodeGen::DoObjectLiteral(LObjectLiteral* instr) { |
ASSERT(ToRegister(instr->context()).is(esi)); |
Handle<FixedArray> literals(instr->environment()->closure()->literals()); |