[arm][arm64] Minor improvements to MathMaxMin.

src/arm/builtins-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/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 137 matching lines @@
   Condition const cc_swap = (kind == MathMaxMinKind::kMin) ? gt : mi;
   Heap::RootListIndex const root_index =
       (kind == MathMaxMinKind::kMin) ? Heap::kInfinityValueRootIndex
                                      : Heap::kMinusInfinityValueRootIndex;
   DoubleRegister const reg = (kind == MathMaxMinKind::kMin) ? d2 : d1;
 
   // Load the accumulator with the default return value (either -Infinity or
   // +Infinity), with the tagged value in r1 and the double value in d1.
   __ LoadRoot(r1, root_index);
   __ vldr(d1, FieldMemOperand(r1, HeapNumber::kValueOffset));
-  __ mov(r4, r0);
+
+  // Remember how many slots to drop (including the receiver).
+  __ add(r4, r0, Operand(1));
 
   Label done_loop, loop;
   __ bind(&loop);
   {
     // Check if all parameters done.
     __ sub(r0, r0, Operand(1), SetCC);
     __ b(lt, &done_loop);
 
     // Load the next parameter tagged value into r2.
     __ ldr(r2, MemOperand(sp, r0, LSL, kPointerSizeLog2));
 
     // Load the double value of the parameter into d2, maybe converting the
     // parameter to a number first using the ToNumberStub if necessary.
     Label convert, convert_smi, convert_number, done_convert;
     __ bind(&convert);
     __ JumpIfSmi(r2, &convert_smi);
     __ ldr(r3, FieldMemOperand(r2, HeapObject::kMapOffset));
     __ JumpIfRoot(r3, Heap::kHeapNumberMapRootIndex, &convert_number);
     {
       // Parameter is not a Number, use the ToNumberStub to convert it.
       FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
-      __ SmiTag(r0, r0);
-      __ SmiTag(r4, r4);
+      __ SmiTag(r0);
+      __ SmiTag(r4);
       __ Push(r0, r1, r4);
       __ mov(r0, r2);
       ToNumberStub stub(masm->isolate());
       __ CallStub(&stub);
       __ mov(r2, r0);
       __ Pop(r0, r1, r4);
       {
         // Restore the double accumulator value (d1).
-        Label restore_smi, done_restore;
-        __ JumpIfSmi(r1, &restore_smi);
+        Label done_restore;
+        __ SmiToDouble(d1, r1);
+        __ JumpIfSmi(r1, &done_restore);
         __ vldr(d1, FieldMemOperand(r1, HeapNumber::kValueOffset));
-        __ b(&done_restore);
-        __ bind(&restore_smi);
-        __ SmiToDouble(d1, r1);
         __ bind(&done_restore);
       }
       __ SmiUntag(r4);
       __ SmiUntag(r0);
     }
     __ b(&convert);
     __ bind(&convert_number);
     __ vldr(d2, FieldMemOperand(r2, HeapNumber::kValueOffset));
     __ b(&done_convert);
     __ bind(&convert_smi);
@@ skipping 22 matching lines @@
     // At least one side is NaN, which means that the result will be NaN too.
     __ bind(&compare_nan);
     __ LoadRoot(r1, Heap::kNanValueRootIndex);
     __ vldr(d1, FieldMemOperand(r1, HeapNumber::kValueOffset));
     __ b(&loop);
   }
 
   __ bind(&done_loop);
   __ mov(r0, r1);
   __ Drop(r4);
-  __ Ret(1);
+  __ Ret();
 }
 
 // static
 void Builtins::Generate_NumberConstructor(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r0                     : number of arguments
   //  -- r1                     : constructor function
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
   //  -- sp[argc * 4]           : receiver
@@ skipping 2451 matching lines @@
   }
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM