| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 06a6506b2216580401c8b666ad6de2499d1bc14a..7c7352d011495c29cc65e911cf1db71d2b91e328 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -5411,80 +5411,6 @@ void LCodeGen::DoCheckPrototypeMaps(LCheckPrototypeMaps* instr) {
|
| }
|
|
|
|
|
| -void LCodeGen::DoAllocateObject(LAllocateObject* instr) {
|
| - class DeferredAllocateObject: public LDeferredCode {
|
| - public:
|
| - DeferredAllocateObject(LCodeGen* codegen, LAllocateObject* instr)
|
| - : LDeferredCode(codegen), instr_(instr) { }
|
| - virtual void Generate() { codegen()->DoDeferredAllocateObject(instr_); }
|
| - virtual LInstruction* instr() { return instr_; }
|
| - private:
|
| - LAllocateObject* instr_;
|
| - };
|
| -
|
| - DeferredAllocateObject* deferred =
|
| - new(zone()) DeferredAllocateObject(this, instr);
|
| -
|
| - Register result = ToRegister(instr->result());
|
| - Register scratch = ToRegister(instr->temp());
|
| - Register scratch2 = ToRegister(instr->temp2());
|
| - Handle<JSFunction> constructor = instr->hydrogen()->constructor();
|
| - Handle<Map> initial_map = instr->hydrogen()->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(instance_size, result, scratch, scratch2, deferred->entry(),
|
| - TAG_OBJECT);
|
| -
|
| - __ bind(deferred->exit());
|
| - if (FLAG_debug_code) {
|
| - Label is_in_new_space;
|
| - __ JumpIfInNewSpace(result, scratch, &is_in_new_space);
|
| - __ Abort("Allocated object is not in new-space");
|
| - __ bind(&is_in_new_space);
|
| - }
|
| -
|
| - // 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));
|
| - }
|
| - }
|
| -}
|
| -
|
| -
|
| -void LCodeGen::DoDeferredAllocateObject(LAllocateObject* instr) {
|
| - Register result = ToRegister(instr->result());
|
| - Handle<Map> initial_map = instr->hydrogen()->constructor_initial_map();
|
| - int instance_size = initial_map->instance_size();
|
| -
|
| - // TODO(3095996): Get rid of this. For now, we need to make the
|
| - // result register contain a valid pointer because it is already
|
| - // contained in the register pointer map.
|
| - __ mov(result, Operand::Zero());
|
| -
|
| - PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters);
|
| - __ mov(r0, Operand(Smi::FromInt(instance_size)));
|
| - __ push(r0);
|
| - CallRuntimeFromDeferred(Runtime::kAllocateInNewSpace, 1, instr);
|
| - __ StoreToSafepointRegisterSlot(r0, result);
|
| -}
|
| -
|
| -
|
| void LCodeGen::DoAllocate(LAllocate* instr) {
|
| class DeferredAllocate: public LDeferredCode {
|
| public:
|
|
|