Index: src/crankshaft/ppc/lithium-codegen-ppc.cc |
diff --git a/src/crankshaft/ppc/lithium-codegen-ppc.cc b/src/crankshaft/ppc/lithium-codegen-ppc.cc |
index bfaff1014eee5e682c6db611af8726a4cc22f5ba..ad816f61d8deea35b331ef774172fd17e04daa9a 100644 |
--- a/src/crankshaft/ppc/lithium-codegen-ppc.cc |
+++ b/src/crankshaft/ppc/lithium-codegen-ppc.cc |
@@ -5371,9 +5371,7 @@ void LCodeGen::DoAllocate(LAllocate* instr) { |
flags = static_cast<AllocationFlags>(flags | ALLOCATION_FOLDING_DOMINATOR); |
} |
- if (instr->hydrogen()->IsAllocationFolded()) { |
- flags = static_cast<AllocationFlags>(flags | ALLOCATION_FOLDED); |
- } |
+ DCHECK(!instr->hydrogen()->IsAllocationFolded()); |
if (instr->size()->IsConstantOperand()) { |
int32_t size = ToInteger32(LConstantOperand::cast(instr->size())); |
@@ -5468,11 +5466,12 @@ void LCodeGen::DoDeferredAllocate(LAllocate* instr) { |
void LCodeGen::DoFastAllocate(LFastAllocate* instr) { |
DCHECK(instr->hydrogen()->IsAllocationFolded()); |
+ DCHECK(!instr->hydrogen()->IsAllocationFoldingDominator()); |
Register result = ToRegister(instr->result()); |
Register scratch1 = ToRegister(instr->temp1()); |
Register scratch2 = ToRegister(instr->temp2()); |
- AllocationFlags flags = NO_ALLOCATION_FLAGS; |
+ AllocationFlags flags = ALLOCATION_FOLDED; |
if (instr->hydrogen()->MustAllocateDoubleAligned()) { |
flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT); |
} |
@@ -5480,15 +5479,13 @@ void LCodeGen::DoFastAllocate(LFastAllocate* instr) { |
DCHECK(!instr->hydrogen()->IsNewSpaceAllocation()); |
flags = static_cast<AllocationFlags>(flags | PRETENURE); |
} |
- if (!instr->hydrogen()->IsAllocationFoldingDominator()) { |
- if (instr->size()->IsConstantOperand()) { |
- int32_t size = ToInteger32(LConstantOperand::cast(instr->size())); |
- CHECK(size <= Page::kMaxRegularHeapObjectSize); |
- __ FastAllocate(size, result, scratch1, scratch2, flags); |
- } else { |
- Register size = ToRegister(instr->size()); |
- __ FastAllocate(size, result, scratch1, scratch2, flags); |
- } |
+ if (instr->size()->IsConstantOperand()) { |
+ int32_t size = ToInteger32(LConstantOperand::cast(instr->size())); |
+ CHECK(size <= Page::kMaxRegularHeapObjectSize); |
+ __ FastAllocate(size, result, scratch1, scratch2, flags); |
+ } else { |
+ Register size = ToRegister(instr->size()); |
+ __ FastAllocate(size, result, scratch1, scratch2, flags); |
} |
} |