| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 04661d326b5d18ff2babf2e64fbc344b091816da..9d228b394b2928d7f3831f27a47aa1ddccfd09e4 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -5509,8 +5509,12 @@ void LCodeGen::DoAllocate(LAllocate* instr) {
|
| flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT);
|
| }
|
| if (instr->hydrogen()->CanAllocateInOldPointerSpace()) {
|
| + ASSERT(!instr->hydrogen()->CanAllocateInOldDataSpace());
|
| flags = static_cast<AllocationFlags>(flags | PRETENURE_OLD_POINTER_SPACE);
|
| + } else if (instr->hydrogen()->CanAllocateInOldDataSpace()) {
|
| + flags = static_cast<AllocationFlags>(flags | PRETENURE_OLD_DATA_SPACE);
|
| }
|
| +
|
| if (instr->size()->IsConstantOperand()) {
|
| int32_t size = ToInteger32(LConstantOperand::cast(instr->size()));
|
| __ Allocate(size, result, scratch, scratch2, deferred->entry(), flags);
|
| @@ -5548,11 +5552,12 @@ void LCodeGen::DoDeferredAllocate(LAllocate* instr) {
|
| }
|
|
|
| if (instr->hydrogen()->CanAllocateInOldPointerSpace()) {
|
| - CallRuntimeFromDeferred(
|
| - Runtime::kAllocateInOldPointerSpace, 1, instr);
|
| + ASSERT(!instr->hydrogen()->CanAllocateInOldDataSpace());
|
| + CallRuntimeFromDeferred(Runtime::kAllocateInOldPointerSpace, 1, instr);
|
| + } else if (instr->hydrogen()->CanAllocateInOldDataSpace()) {
|
| + CallRuntimeFromDeferred(Runtime::kAllocateInOldDataSpace, 1, instr);
|
| } else {
|
| - CallRuntimeFromDeferred(
|
| - Runtime::kAllocateInNewSpace, 1, instr);
|
| + CallRuntimeFromDeferred(Runtime::kAllocateInNewSpace, 1, instr);
|
| }
|
| __ StoreToSafepointRegisterSlot(r0, result);
|
| }
|
|
|