Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index f140e394569dabf20b322114594c2ccf99f47c33..29f82605e1407cb39831ca9fe71681c17e8acd0f 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -2842,6 +2842,14 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr, |
} |
+void LCodeGen::DoInstanceSize(LInstanceSize* instr) { |
+ Register object = ToRegister(instr->object()); |
+ Register result = ToRegister(instr->result()); |
+ __ ldr(result, FieldMemOperand(object, HeapObject::kMapOffset)); |
+ __ ldrb(result, FieldMemOperand(result, Map::kInstanceSizeOffset)); |
+} |
+ |
+ |
void LCodeGen::DoCmpT(LCmpT* instr) { |
Token::Value op = instr->op(); |
@@ -5602,26 +5610,31 @@ void LCodeGen::DoAllocate(LAllocate* instr) { |
DeferredAllocate* deferred = |
new(zone()) DeferredAllocate(this, instr); |
- Register size = ToRegister(instr->size()); |
Register result = ToRegister(instr->result()); |
Register scratch = ToRegister(instr->temp1()); |
Register scratch2 = ToRegister(instr->temp2()); |
- HAllocate* original_instr = instr->hydrogen(); |
- if (original_instr->size()->IsConstant()) { |
- UNREACHABLE(); |
+ // Allocate memory for the object. |
+ AllocationFlags flags = TAG_OBJECT; |
+ if (instr->hydrogen()->MustAllocateDoubleAligned()) { |
+ flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT); |
+ } |
+ if (instr->size()->IsConstantOperand()) { |
+ int32_t size = ToInteger32(LConstantOperand::cast(instr->size())); |
+ __ AllocateInNewSpace(size, |
+ result, |
+ scratch, |
+ scratch2, |
+ deferred->entry(), |
+ flags); |
} else { |
- // Allocate memory for the object. |
- AllocationFlags flags = TAG_OBJECT; |
- if (original_instr->MustAllocateDoubleAligned()) { |
- flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT); |
- } |
+ Register size = ToRegister(instr->size()); |
__ AllocateInNewSpace(size, |
result, |
scratch, |
scratch2, |
deferred->entry(), |
- TAG_OBJECT); |
+ flags); |
} |
__ bind(deferred->exit()); |
@@ -5869,21 +5882,22 @@ void LCodeGen::DoObjectLiteral(LObjectLiteral* instr) { |
instr->hydrogen()->constant_properties(); |
// Set up the parameters to the stub/runtime call. |
- __ LoadHeapObject(r4, literals); |
- __ mov(r3, Operand(Smi::FromInt(instr->hydrogen()->literal_index()))); |
- __ mov(r2, Operand(constant_properties)); |
+ __ LoadHeapObject(r3, literals); |
+ __ mov(r2, Operand(Smi::FromInt(instr->hydrogen()->literal_index()))); |
+ __ mov(r1, Operand(constant_properties)); |
int flags = instr->hydrogen()->fast_elements() |
? ObjectLiteral::kFastElements |
: ObjectLiteral::kNoFlags; |
- __ mov(r1, Operand(Smi::FromInt(flags))); |
- __ Push(r4, r3, r2, r1); |
+ __ mov(r0, Operand(Smi::FromInt(flags))); |
// Pick the right runtime function or stub to call. |
int properties_count = constant_properties->length() / 2; |
if (instr->hydrogen()->depth() > 1) { |
+ __ Push(r3, r2, r1, r0); |
CallRuntime(Runtime::kCreateObjectLiteral, 4, instr); |
} else if (flags != ObjectLiteral::kFastElements || |
properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) { |
+ __ Push(r3, r2, r1, r0); |
CallRuntime(Runtime::kCreateObjectLiteralShallow, 4, instr); |
} else { |
FastCloneShallowObjectStub stub(properties_count); |