| Index: src/crankshaft/arm/lithium-codegen-arm.cc
|
| diff --git a/src/crankshaft/arm/lithium-codegen-arm.cc b/src/crankshaft/arm/lithium-codegen-arm.cc
|
| index 26b852039b67bf4be382f4cc7f22c9ceb811daaf..a282d9ba1647a7115dc66ef0db18ff9b24fdf141 100644
|
| --- a/src/crankshaft/arm/lithium-codegen-arm.cc
|
| +++ b/src/crankshaft/arm/lithium-codegen-arm.cc
|
| @@ -4496,7 +4496,7 @@ void LCodeGen::DoDeferredNumberTagIU(LInstruction* instr,
|
|
|
| if (FLAG_inline_new) {
|
| __ LoadRoot(tmp3, Heap::kHeapNumberMapRootIndex);
|
| - __ AllocateHeapNumber(dst, tmp1, tmp2, tmp3, &slow, DONT_TAG_RESULT);
|
| + __ AllocateHeapNumber(dst, tmp1, tmp2, tmp3, &slow);
|
| __ b(&done);
|
| }
|
|
|
| @@ -4520,15 +4520,13 @@ void LCodeGen::DoDeferredNumberTagIU(LInstruction* instr,
|
| __ CallRuntimeSaveDoubles(Runtime::kAllocateHeapNumber);
|
| RecordSafepointWithRegisters(
|
| instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
|
| - __ sub(r0, r0, Operand(kHeapObjectTag));
|
| __ StoreToSafepointRegisterSlot(r0, dst);
|
| }
|
|
|
| // Done. Put the value in dbl_scratch into the value of the allocated heap
|
| // number.
|
| __ bind(&done);
|
| - __ vstr(dbl_scratch, dst, HeapNumber::kValueOffset);
|
| - __ add(dst, dst, Operand(kHeapObjectTag));
|
| + __ vstr(dbl_scratch, FieldMemOperand(dst, HeapNumber::kValueOffset));
|
| }
|
|
|
|
|
| @@ -4553,16 +4551,12 @@ void LCodeGen::DoNumberTagD(LNumberTagD* instr) {
|
| DeferredNumberTagD* deferred = new(zone()) DeferredNumberTagD(this, instr);
|
| if (FLAG_inline_new) {
|
| __ LoadRoot(scratch, Heap::kHeapNumberMapRootIndex);
|
| - // We want the untagged address first for performance
|
| - __ AllocateHeapNumber(reg, temp1, temp2, scratch, deferred->entry(),
|
| - DONT_TAG_RESULT);
|
| + __ AllocateHeapNumber(reg, temp1, temp2, scratch, deferred->entry());
|
| } else {
|
| __ jmp(deferred->entry());
|
| }
|
| __ bind(deferred->exit());
|
| - __ vstr(input_reg, reg, HeapNumber::kValueOffset);
|
| - // Now that we have finished with the object's real address tag it
|
| - __ add(reg, reg, Operand(kHeapObjectTag));
|
| + __ vstr(input_reg, FieldMemOperand(reg, HeapNumber::kValueOffset));
|
| }
|
|
|
|
|
| @@ -4583,7 +4577,6 @@ void LCodeGen::DoDeferredNumberTagD(LNumberTagD* instr) {
|
| __ CallRuntimeSaveDoubles(Runtime::kAllocateHeapNumber);
|
| RecordSafepointWithRegisters(
|
| instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
|
| - __ sub(r0, r0, Operand(kHeapObjectTag));
|
| __ StoreToSafepointRegisterSlot(r0, reg);
|
| }
|
|
|
| @@ -5107,7 +5100,7 @@ void LCodeGen::DoAllocate(LAllocate* instr) {
|
| Register scratch2 = ToRegister(instr->temp2());
|
|
|
| // Allocate memory for the object.
|
| - AllocationFlags flags = TAG_OBJECT;
|
| + AllocationFlags flags = NO_ALLOCATION_FLAGS;
|
| if (instr->hydrogen()->MustAllocateDoubleAligned()) {
|
| flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT);
|
| }
|
|
|