| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index 3ddad068bfdfc0454442a87e3fd964269d5e6298..aada178d273ea48a13b5105eff4e69b6c0e347ca 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -6048,10 +6048,12 @@ void LCodeGen::DoAllocate(LAllocate* instr) {
|
| if (instr->hydrogen()->MustAllocateDoubleAligned()) {
|
| flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT);
|
| }
|
| - if (instr->hydrogen()->CanAllocateInOldPointerSpace()) {
|
| - ASSERT(!instr->hydrogen()->CanAllocateInOldDataSpace());
|
| + if (instr->hydrogen()->AllocateInOldPointerSpace()) {
|
| + ASSERT(!instr->hydrogen()->AllocateInOldDataSpace());
|
| + ASSERT(!instr->hydrogen()->AllocateInNewSpace());
|
| flags = static_cast<AllocationFlags>(flags | PRETENURE_OLD_POINTER_SPACE);
|
| - } else if (instr->hydrogen()->CanAllocateInOldDataSpace()) {
|
| + } else if (instr->hydrogen()->AllocateInOldDataSpace()) {
|
| + ASSERT(!instr->hydrogen()->AllocateInNewSpace());
|
| flags = static_cast<AllocationFlags>(flags | PRETENURE_OLD_DATA_SPACE);
|
| }
|
|
|
| @@ -6103,11 +6105,13 @@ void LCodeGen::DoDeferredAllocate(LAllocate* instr) {
|
| __ push(Immediate(Smi::FromInt(size)));
|
| }
|
|
|
| - if (instr->hydrogen()->CanAllocateInOldPointerSpace()) {
|
| - ASSERT(!instr->hydrogen()->CanAllocateInOldDataSpace());
|
| + if (instr->hydrogen()->AllocateInOldPointerSpace()) {
|
| + ASSERT(!instr->hydrogen()->AllocateInOldDataSpace());
|
| + ASSERT(!instr->hydrogen()->AllocateInNewSpace());
|
| CallRuntimeFromDeferred(
|
| Runtime::kAllocateInOldPointerSpace, 1, instr, instr->context());
|
| - } else if (instr->hydrogen()->CanAllocateInOldDataSpace()) {
|
| + } else if (instr->hydrogen()->AllocateInOldDataSpace()) {
|
| + ASSERT(!instr->hydrogen()->AllocateInNewSpace());
|
| CallRuntimeFromDeferred(
|
| Runtime::kAllocateInOldDataSpace, 1, instr, instr->context());
|
| } else {
|
|
|