Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 972082439e50316546f3f8e4ab7d19313d617703..f7b57300937a8e7e0eced51d591b221f9781d8ff 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -2081,10 +2081,8 @@ void MacroAssembler::Allocate(int object_size, |
b(hi, gc_required); |
str(result_end, MemOperand(top_address)); |
- // Tag object if requested. |
- if ((flags & TAG_OBJECT) != 0) { |
- add(result, result, Operand(kHeapObjectTag)); |
- } |
+ // Tag object. |
+ add(result, result, Operand(kHeapObjectTag)); |
} |
@@ -2177,10 +2175,8 @@ void MacroAssembler::Allocate(Register object_size, Register result, |
} |
str(result_end, MemOperand(top_address)); |
- // Tag object if requested. |
- if ((flags & TAG_OBJECT) != 0) { |
- add(result, result, Operand(kHeapObjectTag)); |
- } |
+ // Tag object. |
+ add(result, result, Operand(kHeapObjectTag)); |
} |
@@ -2199,12 +2195,8 @@ void MacroAssembler::AllocateTwoByteString(Register result, |
and_(scratch1, scratch1, Operand(~kObjectAlignmentMask)); |
// Allocate two-byte string in new space. |
- Allocate(scratch1, |
- result, |
- scratch2, |
- scratch3, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(scratch1, result, scratch2, scratch3, gc_required, |
+ NO_ALLOCATION_FLAGS); |
// Set the map, length and hash field. |
InitializeNewString(result, |
@@ -2228,12 +2220,8 @@ void MacroAssembler::AllocateOneByteString(Register result, Register length, |
and_(scratch1, scratch1, Operand(~kObjectAlignmentMask)); |
// Allocate one-byte string in new space. |
- Allocate(scratch1, |
- result, |
- scratch2, |
- scratch3, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(scratch1, result, scratch2, scratch3, gc_required, |
+ NO_ALLOCATION_FLAGS); |
// Set the map, length and hash field. |
InitializeNewString(result, length, Heap::kOneByteStringMapRootIndex, |
@@ -2247,7 +2235,7 @@ void MacroAssembler::AllocateTwoByteConsString(Register result, |
Register scratch2, |
Label* gc_required) { |
Allocate(ConsString::kSize, result, scratch1, scratch2, gc_required, |
- TAG_OBJECT); |
+ NO_ALLOCATION_FLAGS); |
InitializeNewString(result, |
length, |
@@ -2261,12 +2249,8 @@ void MacroAssembler::AllocateOneByteConsString(Register result, Register length, |
Register scratch1, |
Register scratch2, |
Label* gc_required) { |
- Allocate(ConsString::kSize, |
- result, |
- scratch1, |
- scratch2, |
- gc_required, |
- TAG_OBJECT); |
+ Allocate(ConsString::kSize, result, scratch1, scratch2, gc_required, |
+ NO_ALLOCATION_FLAGS); |
InitializeNewString(result, length, Heap::kConsOneByteStringMapRootIndex, |
scratch1, scratch2); |
@@ -2279,7 +2263,7 @@ void MacroAssembler::AllocateTwoByteSlicedString(Register result, |
Register scratch2, |
Label* gc_required) { |
Allocate(SlicedString::kSize, result, scratch1, scratch2, gc_required, |
- TAG_OBJECT); |
+ NO_ALLOCATION_FLAGS); |
InitializeNewString(result, |
length, |
@@ -2295,7 +2279,7 @@ void MacroAssembler::AllocateOneByteSlicedString(Register result, |
Register scratch2, |
Label* gc_required) { |
Allocate(SlicedString::kSize, result, scratch1, scratch2, gc_required, |
- TAG_OBJECT); |
+ NO_ALLOCATION_FLAGS); |
InitializeNewString(result, length, Heap::kSlicedOneByteStringMapRootIndex, |
scratch1, scratch2); |
@@ -3211,12 +3195,11 @@ void MacroAssembler::AllocateHeapNumber(Register result, |
Register scratch2, |
Register heap_number_map, |
Label* gc_required, |
- TaggingMode tagging_mode, |
MutableMode mode) { |
// Allocate an object in the heap for the heap number and tag it as a heap |
// object. |
Allocate(HeapNumber::kSize, result, scratch1, scratch2, gc_required, |
- tagging_mode == TAG_RESULT ? TAG_OBJECT : NO_ALLOCATION_FLAGS); |
+ NO_ALLOCATION_FLAGS); |
Heap::RootListIndex map_index = mode == MUTABLE |
? Heap::kMutableHeapNumberMapRootIndex |
@@ -3224,11 +3207,7 @@ void MacroAssembler::AllocateHeapNumber(Register result, |
AssertIsRoot(heap_number_map, map_index); |
// Store heap number map in the allocated object. |
- if (tagging_mode == TAG_RESULT) { |
- str(heap_number_map, FieldMemOperand(result, HeapObject::kMapOffset)); |
- } else { |
- str(heap_number_map, MemOperand(result, HeapObject::kMapOffset)); |
- } |
+ str(heap_number_map, FieldMemOperand(result, HeapObject::kMapOffset)); |
} |
@@ -3253,7 +3232,8 @@ void MacroAssembler::AllocateJSValue(Register result, Register constructor, |
DCHECK(!result.is(value)); |
// Allocate JSValue in new space. |
- Allocate(JSValue::kSize, result, scratch1, scratch2, gc_required, TAG_OBJECT); |
+ Allocate(JSValue::kSize, result, scratch1, scratch2, gc_required, |
+ NO_ALLOCATION_FLAGS); |
// Initialize the JSValue. |
LoadGlobalFunctionInitialMap(constructor, scratch1, scratch2); |