Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 630ae8dbd9c02139b453fae086d30a89607b1210..c94680133107cec8fdbe75fdbf3d89f5ae4a8e6f 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -4343,9 +4343,45 @@ void LCodeGen::DoAllocateObject(LAllocateObject* instr) { |
DeferredAllocateObject* deferred = new DeferredAllocateObject(this, instr); |
- // TODO(mstarzinger): Implement inlined version instead of jumping to |
- // deferred runtime call. |
- __ jmp(deferred->entry()); |
+ Register result = ToRegister(instr->result()); |
+ Register scratch = ToRegister(instr->TempAt(0)); |
+ Register scratch2 = ToRegister(instr->TempAt(1)); |
+ Handle<JSFunction> constructor = instr->hydrogen()->constructor(); |
+ Handle<Map> initial_map(constructor->initial_map()); |
+ int instance_size = initial_map->instance_size(); |
+ ASSERT(initial_map->pre_allocated_property_fields() + |
+ initial_map->unused_property_fields() - |
+ initial_map->inobject_properties() == 0); |
+ |
+ // Allocate memory for the object. The initial map might change when |
+ // the constructor's prototype changes, but instance size and property |
+ // counts remain unchanged (if slack tracking finished). |
+ ASSERT(!constructor->shared()->IsInobjectSlackTrackingInProgress()); |
+ __ AllocateInNewSpace(instance_size, |
+ result, |
+ scratch, |
+ scratch2, |
+ deferred->entry(), |
+ TAG_OBJECT); |
+ |
+ // Load the initial map. |
+ Register map = scratch; |
+ __ LoadHeapObject(map, constructor); |
+ __ ldr(map, FieldMemOperand(map, JSFunction::kPrototypeOrInitialMapOffset)); |
+ |
+ // Initialize map and fields of the newly allocated object. |
+ ASSERT(initial_map->instance_type() == JS_OBJECT_TYPE); |
+ __ str(map, FieldMemOperand(result, JSObject::kMapOffset)); |
+ __ LoadRoot(scratch, Heap::kEmptyFixedArrayRootIndex); |
+ __ str(scratch, FieldMemOperand(result, JSObject::kElementsOffset)); |
+ __ str(scratch, FieldMemOperand(result, JSObject::kPropertiesOffset)); |
+ if (initial_map->inobject_properties() != 0) { |
+ __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex); |
+ for (int i = 0; i < initial_map->inobject_properties(); i++) { |
+ int property_offset = JSObject::kHeaderSize + i * kPointerSize; |
+ __ str(scratch, FieldMemOperand(result, property_offset)); |
+ } |
+ } |
__ bind(deferred->exit()); |
} |