Cleanup allocation folding states in lithium.

src/crankshaft/arm/lithium-codegen-arm.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.
 
 #include "src/crankshaft/arm/lithium-codegen-arm.h"
 
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/crankshaft/arm/lithium-gap-resolver-arm.h"
@@ skipping 5094 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, scratch, scratch2, deferred->entry(), flags);
   } else {
     Register size = ToRegister(instr->size());
     __ Allocate(size, result, scratch, scratch2, deferred->entry(), flags);
   }
 
@@ skipping 70 matching lines @@
     Register top_address = scratch0();
     __ sub(r0, r0, Operand(kHeapObjectTag));
     __ mov(top_address, Operand(allocation_top));
     __ str(r0, MemOperand(top_address));
     __ add(r0, r0, Operand(kHeapObjectTag));
   }
 }
 
 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);
   }
   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, 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);
   }
 }
 
 
 void LCodeGen::DoTypeof(LTypeof* instr) {
   DCHECK(ToRegister(instr->value()).is(r3));
   DCHECK(ToRegister(instr->result()).is(r0));
   Label end, do_call;
   Register value_register = ToRegister(instr->value());
   __ JumpIfNotSmi(value_register, &do_call);
@@ skipping 346 matching lines @@
   __ ldr(result, FieldMemOperand(scratch,
                                  FixedArray::kHeaderSize - kPointerSize));
   __ bind(deferred->exit());
   __ bind(&done);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8