[js] Replace max/min macros with calls to Math.max/Math.min

In the years since https://codereview.chromium.org/1331993004, a lot has
changed in v8: Math.max/min are now CSA builtins, with lowerings in
TF.

In a quick test on my machine of the microbenchmark on that CL
(modified with start and end values), I don't detect any difference
in speed between the macro versions on master and this version.

Cq-Include-Trybots: master.tryserver.v8:v8_linux_noi18n_rel_ng
Change-Id: I82d9d14c043fd2a112050cdbcb98a872bfb87b61
Reviewed-on: https://chromium-review.googlesource.com/664339Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47994}

src/js/array.js

@@ -15,6 +15,8 @@ var GetIterator;
 var GetMethod;
 var GlobalArray = global.Array;
 var InternalArray = utils.InternalArray;
+var MathMax = global.Math.max;
+var MathMin = global.Math.min;
 var ObjectHasOwnProperty = global.Object.prototype.hasOwnProperty;
 var ObjectToString = global.Object.prototype.toString;
 var iteratorSymbol = utils.ImportNow("iterator_symbol");
@@ -222,7 +224,7 @@ function SparseMove(array, start_i, del_count, len, num_additional_args) {
   // Move data to new array.
   var new_array = new InternalArray(
       // Clamp array length to 2^32-1 to avoid early RangeError.
-      MINSIMPLE(len - del_count + num_additional_args, 0xffffffff));
+      MathMin(len - del_count + num_additional_args, 0xffffffff));
   var big_indices;
   var indices = %GetArrayKeys(array, len);
   if (IS_NUMBER(indices)) {
@@ -612,7 +614,7 @@ function ArraySliceFallback(start, end) {
     if (end_i > len) end_i = len;
   }
 
-  var result = ArraySpeciesCreate(array, MAXSIMPLE(end_i - start_i, 0));
+  var result = ArraySpeciesCreate(array, MathMax(end_i - start_i, 0));
 
   if (end_i < start_i) return result;
 
@@ -1081,28 +1083,28 @@ DEFINE_METHOD_LEN(
     target = TO_INTEGER(target);
     var to;
     if (target < 0) {
-      to = MAXSIMPLE(length + target, 0);
+      to = MathMax(length + target, 0);
     } else {
-      to = MINSIMPLE(target, length);
+      to = MathMin(target, length);
     }
 
     start = TO_INTEGER(start);
     var from;
     if (start < 0) {
-      from = MAXSIMPLE(length + start, 0);
+      from = MathMax(length + start, 0);
     } else {
-      from = MINSIMPLE(start, length);
+      from = MathMin(start, length);
     }
 
     end = IS_UNDEFINED(end) ? length : TO_INTEGER(end);
     var final;
     if (end < 0) {
-      final = MAXSIMPLE(length + end, 0);
+      final = MathMax(length + end, 0);
     } else {
-      final = MINSIMPLE(end, length);
+      final = MathMin(end, length);
     }
 
-    var count = MINSIMPLE(final - from, length - to);
+    var count = MathMin(final - from, length - to);
     var direction = 1;
     if (from < to && to < (from + count)) {
       direction = -1;

src/js/intl.js

@@ -31,6 +31,7 @@ var GlobalRegExp = global.RegExp;
 var GlobalString = global.String;
 var IntlFallbackSymbol = utils.ImportNow("intl_fallback_symbol");
 var InternalArray = utils.InternalArray;
+var MathMax = global.Math.max;
 var ObjectHasOwnProperty = global.Object.prototype.hasOwnProperty;
 var ObjectKeys = global.Object.keys;
 var patternSymbol = utils.ImportNow("intl_pattern_symbol");
@@ -1219,7 +1220,7 @@ function SetNumberFormatDigitOptions(internalOptions, options,
                              mnfdDefault);
   defineWEProperty(internalOptions, 'minimumFractionDigits', mnfd);
 
-  var mxfdActualDefault = MAXSIMPLE(mnfd, mxfdDefault);
+  var mxfdActualDefault = MathMax(mnfd, mxfdDefault);
 
   var mxfd = getNumberOption(options, 'maximumFractionDigits', mnfd, 20,
                              mxfdActualDefault);

src/js/macros.py

@@ -112,7 +112,3 @@ define PROPERTY_FILTER_NONE = 0;
 
 # Check whether debug is active.
 define DEBUG_IS_ACTIVE = (%_DebugIsActive() != 0);
-
-# Min and max
-macro MAXSIMPLE(a, b) = ((a) > (b) ? (a) : (b));
-macro MINSIMPLE(a, b) = ((a) > (b) ? (b) : (a));

src/js/typedarray.js

@@ -25,6 +25,8 @@ var InnerArrayJoin;
 var InnerArraySort;
 var InnerArrayToLocaleString;
 var InternalArray = utils.InternalArray;
+var MathMax = global.Math.max;
+var MathMin = global.Math.min;
 var iteratorSymbol = utils.ImportNow("iterator_symbol");
 var speciesSymbol = utils.ImportNow("species_symbol");
 var toStringTagSymbol = utils.ImportNow("to_string_tag_symbol");
@@ -204,15 +206,15 @@ function NAMESubArray(begin, end) {
   }
 
   if (beginInt < 0) {
-    beginInt = MAXSIMPLE(0, srcLength + beginInt);
+    beginInt = MathMax(0, srcLength + beginInt);
   } else {
-    beginInt = MINSIMPLE(beginInt, srcLength);
+    beginInt = MathMin(beginInt, srcLength);
   }
 
   if (endInt < 0) {
-    endInt = MAXSIMPLE(0, srcLength + endInt);
+    endInt = MathMax(0, srcLength + endInt);
   } else {
-    endInt = MINSIMPLE(endInt, srcLength);
+    endInt = MathMin(endInt, srcLength);
   }
 
   if (endInt < beginInt) {