Cleanup allocation folding states in lithium.

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

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_X87
 
 #include "src/crankshaft/x87/lithium-codegen-x87.h"
 
 #include "src/base/bits.h"
 #include "src/code-factory.h"
@@ skipping 5404 matching lines @@
     flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT);
   }
   if (instr->hydrogen()->IsOldSpaceAllocation()) {
     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()));
     CHECK(size <= Page::kMaxRegularHeapObjectSize);
     __ Allocate(size, result, temp, no_reg, deferred->entry(), flags);
   } else {
     Register size = ToRegister(instr->size());
     __ Allocate(size, result, temp, no_reg, deferred->entry(), flags);
   }
 
@@ skipping 12 matching lines @@
     __ bind(&loop);
     __ mov(FieldOperand(result, temp, times_pointer_size, 0),
         isolate()->factory()->one_pointer_filler_map());
     __ dec(temp);
     __ j(not_zero, &loop);
   }
 }
 
 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);
   }
   if (instr->hydrogen()->IsOldSpaceAllocation()) {
     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);
   }
 }
 
 void LCodeGen::DoDeferredAllocate(LAllocate* instr) {
   Register result = ToRegister(instr->result());
 
   // TODO(3095996): Get rid of this. For now, we need to make the
   // result register contain a valid pointer because it is already
   // contained in the register pointer map.
   __ Move(result, Immediate(Smi::FromInt(0)));
@@ skipping 397 matching lines @@
   __ bind(deferred->exit());
   __ bind(&done);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87