Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index 05fa79247e5fa6722fbe49f294c7a4ec10ca40ca..96003ba22d7aa453c1e4f13a6f2ee7034909b645 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -5211,7 +5211,10 @@ 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())); |
@@ -5250,11 +5253,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(v0, result); |
} |