Chromium Code Reviews| Index: src/arm/code-stubs-arm.cc |
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
| index de285bb2f1a0d575ee30b37404af0e6b8e9a1616..28f5843872355347bda357829200760b5b377387 100644 |
| --- a/src/arm/code-stubs-arm.cc |
| +++ b/src/arm/code-stubs-arm.cc |
| @@ -2966,9 +2966,14 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { |
| __ mov(r0, Operand(arg_count())); |
| __ add(r4, r2, Operand::PointerOffsetFromSmiKey(r3)); |
| - __ ldr(r2, FieldMemOperand(r4, FixedArray::kHeaderSize)); |
| - // Verify that r2 contains an AllocationSite |
| - __ AssertUndefinedOrAllocationSite(r2, r4); |
| + __ ldr(r4, FieldMemOperand(r4, FixedArray::kHeaderSize)); |
| + |
| + // Verify that r4 contains an AllocationSite |
| + __ ldr(r5, FieldMemOperand(r4, AllocationSite::kMapOffset)); |
|
Toon Verwaest
2014/07/28 14:11:38
HeapObject::kMapOffset?
|
| + __ CompareRoot(r5, Heap::kAllocationSiteMapRootIndex); |
| + __ b(ne, &miss); |
| + |
| + __ mov(r2, r4); |
| ArrayConstructorStub stub(masm->isolate(), arg_count()); |
| __ TailCallStub(&stub); |