Cleanup allocation folding states in lithium.

src/crankshaft/ia32/lithium-codegen-ia32.cc

Index: src/crankshaft/ia32/lithium-codegen-ia32.cc
diff --git a/src/crankshaft/ia32/lithium-codegen-ia32.cc b/src/crankshaft/ia32/lithium-codegen-ia32.cc
index 0044f414481d9ced472484986152548408e096c6..7a95bc3ce073e3d5d78fd6ece173c014963e4b52 100644
--- a/src/crankshaft/ia32/lithium-codegen-ia32.cc
+++ b/src/crankshaft/ia32/lithium-codegen-ia32.cc
@@ -4869,14 +4869,10 @@ void LCodeGen::DoAllocate(LAllocate* instr) {
     DCHECK(!instr->hydrogen()->IsNewSpaceAllocation());
     flags = static_cast<AllocationFlags>(flags | PRETENURE);
   }
-
   if (instr->hydrogen()->IsAllocationFoldingDominator()) {
     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()));
@@ -4909,10 +4905,11 @@ void LCodeGen::DoAllocate(LAllocate* instr) {
 
 void LCodeGen::DoFastAllocate(LFastAllocate* instr) {
   DCHECK(instr->hydrogen()->IsAllocationFolded());
+  DCHECK(!instr->hydrogen()->IsAllocationFoldingDominator());
   Register result = ToRegister(instr->result());
   Register temp = ToRegister(instr->temp());
 
-  AllocationFlags flags = NO_ALLOCATION_FLAGS;
+  AllocationFlags flags = ALLOCATION_FOLDED;
   if (instr->hydrogen()->MustAllocateDoubleAligned()) {
     flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT);
   }
@@ -4920,15 +4917,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, temp, flags);
-    } else {
-      Register size = ToRegister(instr->size());
-      __ FastAllocate(size, result, temp, flags);
-    }
+  if (instr->size()->IsConstantOperand()) {
+    int32_t size = ToInteger32(LConstantOperand::cast(instr->size()));
+    CHECK(size <= Page::kMaxRegularHeapObjectSize);
+    __ FastAllocate(size, result, temp, flags);
+  } else {
+    Register size = ToRegister(instr->size());
+    __ FastAllocate(size, result, temp, flags);
   }
 }