[Atomics] Handle conversion to SMI in builtin, not code stub.

src/arm/code-stubs-arm.cc

Index: src/arm/code-stubs-arm.cc
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index 07a7305a34024ace326c3b28074839eece6afe52..322927c86aa8a72daea5677a192dfd999b6b7a53 100644
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -5617,51 +5617,6 @@ void TypedArrayJumpTable(MacroAssembler* masm, Register object,
   __ Abort(kNoReason);
 }
 
-void ReturnInteger32(MacroAssembler* masm, DwVfpRegister dst, Register value,
-                     SwVfpRegister single_scratch, Label* use_heap_number) {
-  Label not_smi;
-  __ TrySmiTag(r0, value, &not_smi);
-  __ Ret();
-
-  __ bind(&not_smi);
-  __ vmov(single_scratch, value);
-  __ vcvt_f64_s32(dst, single_scratch);
-  __ jmp(use_heap_number);
-}
-
-void ReturnUnsignedInteger32(MacroAssembler* masm, DwVfpRegister dst,
-                             Register value, SwVfpRegister single_scratch,
-                             Label* use_heap_number) {
-  Label not_smi;
-  __ cmp(value, Operand(0x40000000U));
-  __ b(cs, &not_smi);
-  __ SmiTag(r0, value);
-  __ Ret();
-
-  __ bind(&not_smi);
-  __ vmov(single_scratch, value);
-  __ vcvt_f64_u32(dst, single_scratch);
-  __ jmp(use_heap_number);
-}
-
-void ReturnAllocatedHeapNumber(MacroAssembler* masm, DwVfpRegister value,
-                               Register scratch, Register scratch2,
-                               Register scratch3) {
-  Label call_runtime;
-  __ LoadRoot(scratch3, Heap::kHeapNumberMapRootIndex);
-  __ AllocateHeapNumber(r0, scratch, scratch2, scratch3, &call_runtime);
-  __ vstr(value, FieldMemOperand(r0, HeapNumber::kValueOffset));
-  __ Ret();
-
-  __ bind(&call_runtime);
-  {
-    FrameScope scope(masm, StackFrame::INTERNAL);
-    __ CallRuntimeSaveDoubles(Runtime::kAllocateHeapNumber);
-    __ vstr(value, FieldMemOperand(r0, HeapNumber::kValueOffset));
-  }
-  __ Ret();
-}
-
 }  // anonymous namespace
 
 void AtomicsLoadStub::Generate(MacroAssembler* masm) {
@@ -5676,41 +5631,32 @@ void AtomicsLoadStub::Generate(MacroAssembler* masm) {
   __ bind(&i8);
   __ ldrsb(r0, MemOperand(backing_store, index));
   __ dmb(ISH);
-  __ SmiTag(r0);
   __ Ret();
 
   __ bind(&u8);
   __ ldrb(r0, MemOperand(backing_store, index));
   __ dmb(ISH);
-  __ SmiTag(r0);
   __ Ret();
 
   __ bind(&i16);
   __ ldrsh(r0, MemOperand(backing_store, index, LSL, 1));
   __ dmb(ISH);
-  __ SmiTag(r0);
   __ Ret();
 
   __ bind(&u16);
   __ ldrh(r0, MemOperand(backing_store, index, LSL, 1));
   __ dmb(ISH);
-  __ SmiTag(r0);
   __ Ret();
 
-  Label use_heap_number;
-
   __ bind(&i32);
   __ ldr(r0, MemOperand(backing_store, index, LSL, 2));
   __ dmb(ISH);
-  ReturnInteger32(masm, d0, r0, s2, &use_heap_number);
+  __ Ret();
 
   __ bind(&u32);
   __ ldr(r0, MemOperand(backing_store, index, LSL, 2));
   __ dmb(ISH);
-  ReturnUnsignedInteger32(masm, d0, r0, s2, &use_heap_number);
-
-  __ bind(&use_heap_number);
-  ReturnAllocatedHeapNumber(masm, d0, r1, r2, r3);
+  __ Ret();
 }
 
 #undef __