Reland "Merge old data and pointer space."

src/x64/macro-assembler-x64.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/v8.h"
 
 #if V8_TARGET_ARCH_X64
 
 #include "src/base/bits.h"
 #include "src/base/division-by-constant.h"
@@ skipping 4109 matching lines @@
                                                  AllocationFlags flags) {
   if (kPointerSize == kDoubleSize) {
     if (FLAG_debug_code) {
       testl(result, Immediate(kDoubleAlignmentMask));
       Check(zero, kAllocationIsNotDoubleAligned);
     }
   } else {
     // Align the next allocation. Storing the filler map without checking top
     // is safe in new-space because the limit of the heap is aligned there.
     DCHECK(kPointerSize * 2 == kDoubleSize);
-    DCHECK((flags & PRETENURE_OLD_POINTER_SPACE) == 0);
     DCHECK(kPointerAlignment * 2 == kDoubleAlignment);
     // Make sure scratch is not clobbered by this function as it might be
     // used in UpdateAllocationTopHelper later.
     DCHECK(!scratch.is(kScratchRegister));
     Label aligned;
     testl(result, Immediate(kDoubleAlignmentMask));
     j(zero, &aligned, Label::kNear);
-    if ((flags & PRETENURE_OLD_DATA_SPACE) != 0) {
+    if ((flags & PRETENURE) != 0) {
       ExternalReference allocation_limit =
           AllocationUtils::GetAllocationLimitReference(isolate(), flags);
       cmpp(result, ExternalOperand(allocation_limit));
       j(above_equal, gc_required);
     }
     LoadRoot(kScratchRegister, Heap::kOnePointerFillerMapRootIndex);
     movp(Operand(result, 0), kScratchRegister);
     addp(result, Immediate(kDoubleSize / 2));
     bind(&aligned);
   }
@@ skipping 935 matching lines @@
   if (mag.shift > 0) sarl(rdx, Immediate(mag.shift));
   movl(rax, dividend);
   shrl(rax, Immediate(31));
   addl(rdx, rax);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64