Get rid of AllocationFlags::TAG_OBJECT

src/x64/code-stubs-x64.cc

 // Copyright 2013 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_X64
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
@@ skipping 4431 matching lines @@
   __ j(not_equal, &new_object);
 
   // Allocate the JSObject on the heap.
   Label allocate, done_allocate;
   __ movzxbl(rbx, FieldOperand(rcx, Map::kInstanceSizeOffset));
   __ leal(rbx, Operand(rbx, times_pointer_size, 0));
   __ Allocate(rbx, rax, rdi, no_reg, &allocate, NO_ALLOCATION_FLAGS);
   __ bind(&done_allocate);
 
   // Initialize the JSObject fields.
-  __ movp(Operand(rax, JSObject::kMapOffset), rcx);
+  __ movp(FieldOperand(rax, JSObject::kMapOffset), rcx);
   __ LoadRoot(rbx, Heap::kEmptyFixedArrayRootIndex);
-  __ movp(Operand(rax, JSObject::kPropertiesOffset), rbx);
-  __ movp(Operand(rax, JSObject::kElementsOffset), rbx);
+  __ movp(FieldOperand(rax, JSObject::kPropertiesOffset), rbx);
+  __ movp(FieldOperand(rax, JSObject::kElementsOffset), rbx);
   STATIC_ASSERT(JSObject::kHeaderSize == 3 * kPointerSize);
-  __ leap(rbx, Operand(rax, JSObject::kHeaderSize));
+  __ leap(rbx, FieldOperand(rax, JSObject::kHeaderSize));
 
   // ----------- S t a t e -------------
-  //  -- rax    : result (untagged)
+  //  -- rax    : result (tagged)
   //  -- rbx    : result fields (untagged)
   //  -- rdi    : result end (untagged)
   //  -- rcx    : initial map
   //  -- rsi    : context
   //  -- rsp[0] : return address
   // -----------------------------------
 
   // Perform in-object slack tracking if requested.
   Label slack_tracking;
   STATIC_ASSERT(Map::kNoSlackTracking == 0);
   __ LoadRoot(r11, Heap::kUndefinedValueRootIndex);
   __ testl(FieldOperand(rcx, Map::kBitField3Offset),
            Immediate(Map::ConstructionCounter::kMask));
   __ j(not_zero, &slack_tracking, Label::kNear);
   {
     // Initialize all in-object fields with undefined.
     __ InitializeFieldsWithFiller(rbx, rdi, r11);
-
-    // Add the object tag to make the JSObject real.
-    STATIC_ASSERT(kHeapObjectTag == 1);
-    __ incp(rax);
     __ Ret();
   }
   __ bind(&slack_tracking);
   {
     // Decrease generous allocation count.
     STATIC_ASSERT(Map::ConstructionCounter::kNext == 32);
     __ subl(FieldOperand(rcx, Map::kBitField3Offset),
             Immediate(1 << Map::ConstructionCounter::kShift));
 
     // Initialize the in-object fields with undefined.
     __ movzxbl(rdx, FieldOperand(rcx, Map::kUnusedPropertyFieldsOffset));
     __ negp(rdx);
     __ leap(rdx, Operand(rdi, rdx, times_pointer_size, 0));
     __ InitializeFieldsWithFiller(rbx, rdx, r11);
 
     // Initialize the remaining (reserved) fields with one pointer filler map.
     __ LoadRoot(r11, Heap::kOnePointerFillerMapRootIndex);
     __ InitializeFieldsWithFiller(rdx, rdi, r11);
 
-    // Add the object tag to make the JSObject real.
-    STATIC_ASSERT(kHeapObjectTag == 1);
-    __ incp(rax);
-
     // Check if we can finalize the instance size.
     Label finalize;
     STATIC_ASSERT(Map::kSlackTrackingCounterEnd == 1);
     __ testl(FieldOperand(rcx, Map::kBitField3Offset),
              Immediate(Map::ConstructionCounter::kMask));
     __ j(zero, &finalize, Label::kNear);
     __ Ret();
 
     // Finalize the instance size.
     __ bind(&finalize);
@@ skipping 10 matching lines @@
   // Fall back to %AllocateInNewSpace.
   __ bind(&allocate);
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
     __ Integer32ToSmi(rbx, rbx);
     __ Push(rcx);
     __ Push(rbx);
     __ CallRuntime(Runtime::kAllocateInNewSpace);
     __ Pop(rcx);
   }
-  STATIC_ASSERT(kHeapObjectTag == 1);
-  __ decp(rax);
   __ movzxbl(rbx, FieldOperand(rcx, Map::kInstanceSizeOffset));
   __ leap(rdi, Operand(rax, rbx, times_pointer_size, 0));
+  STATIC_ASSERT(kHeapObjectTag == 1);
+  __ decp(rdi);  // Remove the tag from the end address.
   __ jmp(&done_allocate);
 
   // Fall back to %NewObject.
   __ bind(&new_object);
   __ PopReturnAddressTo(rcx);
   __ Push(rdi);
   __ Push(rdx);
   __ PushReturnAddressFrom(rcx);
   __ TailCallRuntime(Runtime::kNewObject);
 }
@@ skipping 45 matching lines @@
   // Return an empty rest parameter array.
   __ bind(&no_rest_parameters);
   {
     // ----------- S t a t e -------------
     //  -- rsi    : context
     //  -- rsp[0] : return address
     // -----------------------------------
 
     // Allocate an empty rest parameter array.
     Label allocate, done_allocate;
-    __ Allocate(JSArray::kSize, rax, rdx, rcx, &allocate, TAG_OBJECT);
+    __ Allocate(JSArray::kSize, rax, rdx, rcx, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Setup the rest parameter array in rax.
     __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, rcx);
     __ movp(FieldOperand(rax, JSArray::kMapOffset), rcx);
     __ LoadRoot(rcx, Heap::kEmptyFixedArrayRootIndex);
     __ movp(FieldOperand(rax, JSArray::kPropertiesOffset), rcx);
     __ movp(FieldOperand(rax, JSArray::kElementsOffset), rcx);
     __ movp(FieldOperand(rax, JSArray::kLengthOffset), Immediate(0));
     STATIC_ASSERT(JSArray::kSize == 4 * kPointerSize);
@@ skipping 20 matching lines @@
     //  -- rsi    : context
     //  -- rax    : number of rest parameters
     //  -- rbx    : pointer to first rest parameters
     //  -- rsp[0] : return address
     // -----------------------------------
 
     // Allocate space for the rest parameter array plus the backing store.
     Label allocate, done_allocate;
     __ leal(rcx, Operand(rax, times_pointer_size,
                          JSArray::kSize + FixedArray::kHeaderSize));
-    __ Allocate(rcx, rdx, rdi, no_reg, &allocate, TAG_OBJECT);
+    __ Allocate(rcx, rdx, rdi, no_reg, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Compute the arguments.length in rdi.
     __ Integer32ToSmi(rdi, rax);
 
     // Setup the elements array in rdx.
     __ LoadRoot(rcx, Heap::kFixedArrayMapRootIndex);
     __ movp(FieldOperand(rdx, FixedArray::kMapOffset), rcx);
     __ movp(FieldOperand(rdx, FixedArray::kLengthOffset), rdi);
     {
@@ skipping 127 matching lines @@
   __ leap(r8, Operand(rbx, times_pointer_size, kParameterMapHeaderSize));
   __ bind(&no_parameter_map);
 
   // 2. Backing store.
   __ leap(r8, Operand(r8, r11, times_pointer_size, FixedArray::kHeaderSize));
 
   // 3. Arguments object.
   __ addp(r8, Immediate(JSSloppyArgumentsObject::kSize));
 
   // Do the allocation of all three objects in one go.
-  __ Allocate(r8, rax, r9, no_reg, &runtime, TAG_OBJECT);
+  __ Allocate(r8, rax, r9, no_reg, &runtime, NO_ALLOCATION_FLAGS);
 
   // rax = address of new object(s) (tagged)
   // r11 = argument count (untagged)
   // Get the arguments map from the current native context into r9.
   Label has_mapped_parameters, instantiate;
   __ movp(r9, NativeContextOperand());
   __ testp(rbx, rbx);
   __ j(not_zero, &has_mapped_parameters, Label::kNear);
 
   const int kIndex = Context::SLOPPY_ARGUMENTS_MAP_INDEX;
@@ skipping 183 matching lines @@
   //  -- rax    : number of arguments
   //  -- rbx    : pointer to the first argument
   //  -- rsi    : context
   //  -- rsp[0] : return address
   // -----------------------------------
 
   // Allocate space for the strict arguments object plus the backing store.
   Label allocate, done_allocate;
   __ leal(rcx, Operand(rax, times_pointer_size, JSStrictArgumentsObject::kSize +
                                                     FixedArray::kHeaderSize));
-  __ Allocate(rcx, rdx, rdi, no_reg, &allocate, TAG_OBJECT);
+  __ Allocate(rcx, rdx, rdi, no_reg, &allocate, NO_ALLOCATION_FLAGS);
   __ bind(&done_allocate);
 
   // Compute the arguments.length in rdi.
   __ Integer32ToSmi(rdi, rax);
 
   // Setup the elements array in rdx.
   __ LoadRoot(rcx, Heap::kFixedArrayMapRootIndex);
   __ movp(FieldOperand(rdx, FixedArray::kMapOffset), rcx);
   __ movp(FieldOperand(rdx, FixedArray::kLengthOffset), rdi);
   {
@@ skipping 579 matching lines @@
                            kStackUnwindSpace, nullptr, return_value_operand,
                            NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64