Get rid of AllocationFlags::TAG_OBJECT

src/arm/code-stubs-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.
 
 #if V8_TARGET_ARCH_ARM
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
@@ skipping 4540 matching lines @@
   __ cmp(r0, r1);
   __ b(ne, &new_object);
 
   // Allocate the JSObject on the heap.
   Label allocate, done_allocate;
   __ ldrb(r4, FieldMemOperand(r2, Map::kInstanceSizeOffset));
   __ Allocate(r4, r0, r5, r6, &allocate, SIZE_IN_WORDS);
   __ bind(&done_allocate);
 
   // Initialize the JSObject fields.
-  __ str(r2, MemOperand(r0, JSObject::kMapOffset));
+  __ str(r2, FieldMemOperand(r0, JSObject::kMapOffset));
   __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
-  __ str(r3, MemOperand(r0, JSObject::kPropertiesOffset));
-  __ str(r3, MemOperand(r0, JSObject::kElementsOffset));
+  __ str(r3, FieldMemOperand(r0, JSObject::kPropertiesOffset));
+  __ str(r3, FieldMemOperand(r0, JSObject::kElementsOffset));
   STATIC_ASSERT(JSObject::kHeaderSize == 3 * kPointerSize);
-  __ add(r1, r0, Operand(JSObject::kHeaderSize));
+  __ add(r1, r0, Operand(JSObject::kHeaderSize - kHeapObjectTag));
 
   // ----------- S t a t e -------------
-  //  -- r0 : result (untagged)
+  //  -- r0 : result (tagged)
   //  -- r1 : result fields (untagged)
   //  -- r5 : result end (untagged)
   //  -- r2 : initial map
   //  -- cp : context
   //  -- lr : return address
   // -----------------------------------
 
   // Perform in-object slack tracking if requested.
   Label slack_tracking;
   STATIC_ASSERT(Map::kNoSlackTracking == 0);
   __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);
   __ ldr(r3, FieldMemOperand(r2, Map::kBitField3Offset));
   __ tst(r3, Operand(Map::ConstructionCounter::kMask));
   __ b(ne, &slack_tracking);
   {
     // Initialize all in-object fields with undefined.
     __ InitializeFieldsWithFiller(r1, r5, r6);
-
-    // Add the object tag to make the JSObject real.
-    STATIC_ASSERT(kHeapObjectTag == 1);
-    __ add(r0, r0, Operand(kHeapObjectTag));
     __ Ret();
   }
   __ bind(&slack_tracking);
   {
     // Decrease generous allocation count.
     STATIC_ASSERT(Map::ConstructionCounter::kNext == 32);
     __ sub(r3, r3, Operand(1 << Map::ConstructionCounter::kShift));
     __ str(r3, FieldMemOperand(r2, Map::kBitField3Offset));
 
     // Initialize the in-object fields with undefined.
     __ ldrb(r4, FieldMemOperand(r2, Map::kUnusedPropertyFieldsOffset));
     __ sub(r4, r5, Operand(r4, LSL, kPointerSizeLog2));
     __ InitializeFieldsWithFiller(r1, r4, r6);
 
     // Initialize the remaining (reserved) fields with one pointer filler map.
     __ LoadRoot(r6, Heap::kOnePointerFillerMapRootIndex);
     __ InitializeFieldsWithFiller(r1, r5, r6);
 
-    // Add the object tag to make the JSObject real.
-    STATIC_ASSERT(kHeapObjectTag == 1);
-    __ add(r0, r0, Operand(kHeapObjectTag));
-
     // Check if we can finalize the instance size.
     STATIC_ASSERT(Map::kSlackTrackingCounterEnd == 1);
     __ tst(r3, Operand(Map::ConstructionCounter::kMask));
     __ Ret(ne);
 
     // Finalize the instance size.
     {
       FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
       __ Push(r0, r2);
       __ CallRuntime(Runtime::kFinalizeInstanceSize);
       __ Pop(r0);
     }
     __ Ret();
   }
 
   // Fall back to %AllocateInNewSpace.
   __ bind(&allocate);
   {
     FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
     STATIC_ASSERT(kSmiTag == 0);
     STATIC_ASSERT(kSmiTagSize == 1);
     __ mov(r4, Operand(r4, LSL, kPointerSizeLog2 + 1));
     __ Push(r2, r4);
     __ CallRuntime(Runtime::kAllocateInNewSpace);
     __ Pop(r2);
   }
-  STATIC_ASSERT(kHeapObjectTag == 1);
-  __ sub(r0, r0, Operand(kHeapObjectTag));
   __ ldrb(r5, FieldMemOperand(r2, Map::kInstanceSizeOffset));
   __ add(r5, r0, Operand(r5, LSL, kPointerSizeLog2));
+  STATIC_ASSERT(kHeapObjectTag == 1);
+  __ sub(r5, r5, Operand(kHeapObjectTag));
   __ b(&done_allocate);
 
   // Fall back to %NewObject.
   __ bind(&new_object);
   __ Push(r1, r3);
   __ TailCallRuntime(Runtime::kNewObject);
 }
 
 
 void FastNewRestParameterStub::Generate(MacroAssembler* masm) {
@@ skipping 42 matching lines @@
   // Return an empty rest parameter array.
   __ bind(&no_rest_parameters);
   {
     // ----------- S t a t e -------------
     //  -- cp : context
     //  -- lr : return address
     // -----------------------------------
 
     // Allocate an empty rest parameter array.
     Label allocate, done_allocate;
-    __ Allocate(JSArray::kSize, r0, r1, r2, &allocate, TAG_OBJECT);
+    __ Allocate(JSArray::kSize, r0, r1, r2, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Setup the rest parameter array in r0.
     __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, r1);
     __ str(r1, FieldMemOperand(r0, JSArray::kMapOffset));
     __ LoadRoot(r1, Heap::kEmptyFixedArrayRootIndex);
     __ str(r1, FieldMemOperand(r0, JSArray::kPropertiesOffset));
     __ str(r1, FieldMemOperand(r0, JSArray::kElementsOffset));
     __ mov(r1, Operand(0));
     __ str(r1, FieldMemOperand(r0, JSArray::kLengthOffset));
@@ skipping 21 matching lines @@
     //  -- cp : context
     //  -- r0 : number of rest parameters (tagged)
     //  -- r2 : pointer to first rest parameters
     //  -- lr : return address
     // -----------------------------------
 
     // Allocate space for the rest parameter array plus the backing store.
     Label allocate, done_allocate;
     __ mov(r1, Operand(JSArray::kSize + FixedArray::kHeaderSize));
     __ add(r1, r1, Operand(r0, LSL, kPointerSizeLog2 - 1));
-    __ Allocate(r1, r3, r4, r5, &allocate, TAG_OBJECT);
+    __ Allocate(r1, r3, r4, r5, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Setup the elements array in r3.
     __ LoadRoot(r1, Heap::kFixedArrayMapRootIndex);
     __ str(r1, FieldMemOperand(r3, FixedArray::kMapOffset));
     __ str(r0, FieldMemOperand(r3, FixedArray::kLengthOffset));
     __ add(r4, r3, Operand(FixedArray::kHeaderSize));
     {
       Label loop, done_loop;
       __ add(r1, r4, Operand(r0, LSL, kPointerSizeLog2 - 1));
@@ skipping 111 matching lines @@
   __ add(r9, r9, Operand(kParameterMapHeaderSize), LeaveCC, ne);
 
   // 2. Backing store.
   __ add(r9, r9, Operand(r5, LSL, 1));
   __ add(r9, r9, Operand(FixedArray::kHeaderSize));
 
   // 3. Arguments object.
   __ add(r9, r9, Operand(JSSloppyArgumentsObject::kSize));
 
   // Do the allocation of all three objects in one go.
-  __ Allocate(r9, r0, r9, r4, &runtime, TAG_OBJECT);
+  __ Allocate(r9, r0, r9, r4, &runtime, NO_ALLOCATION_FLAGS);
 
   // r0 = address of new object(s) (tagged)
   // r2 = argument count (smi-tagged)
   // Get the arguments boilerplate from the current native context into r4.
   const int kNormalOffset =
       Context::SlotOffset(Context::SLOPPY_ARGUMENTS_MAP_INDEX);
   const int kAliasedOffset =
       Context::SlotOffset(Context::FAST_ALIASED_ARGUMENTS_MAP_INDEX);
 
   __ ldr(r4, NativeContextMemOperand());
@@ skipping 176 matching lines @@
   //  -- cp : context
   //  -- r0 : number of rest parameters (tagged)
   //  -- r2 : pointer to first rest parameters
   //  -- lr : return address
   // -----------------------------------
 
   // Allocate space for the strict arguments object plus the backing store.
   Label allocate, done_allocate;
   __ mov(r1, Operand(JSStrictArgumentsObject::kSize + FixedArray::kHeaderSize));
   __ add(r1, r1, Operand(r0, LSL, kPointerSizeLog2 - 1));
-  __ Allocate(r1, r3, r4, r5, &allocate, TAG_OBJECT);
+  __ Allocate(r1, r3, r4, r5, &allocate, NO_ALLOCATION_FLAGS);
   __ bind(&done_allocate);
 
   // Setup the elements array in r3.
   __ LoadRoot(r1, Heap::kFixedArrayMapRootIndex);
   __ str(r1, FieldMemOperand(r3, FixedArray::kMapOffset));
   __ str(r0, FieldMemOperand(r3, FixedArray::kLengthOffset));
   __ add(r4, r3, Operand(FixedArray::kHeaderSize));
   {
     Label loop, done_loop;
     __ add(r1, r4, Operand(r0, LSL, kPointerSizeLog2 - 1));
@@ skipping 490 matching lines @@
   CallApiFunctionAndReturn(masm, api_function_address, thunk_ref,
                            kStackUnwindSpace, NULL, return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM