Merged r10755, r11237 into 3.8 branch.

test/mjsunit/math-min-max.js

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 128 matching lines @@
   assertEquals(v2, Math.max(v1++, v2++));
   assertEquals(v1, Math.min(v1++, v2++));
   // Tagged representation.
   assertEquals(v4, Math.max(v3, v4));
   assertEquals(v3, Math.min(v3, v4));
   assertEquals(v6, Math.max(v5, v6));
   assertEquals(v5, Math.min(v5, v6));
   // Double representation.
   assertEquals(v0, Math.max(v0++, v9++));
   assertEquals(v9, Math.min(v0++, v9++));
+  // Mixed representation.
+  assertEquals(v1, Math.min(v1++, v9++));  // int32, double
+  assertEquals(v0, Math.max(v0++, v2++));  // double, int32
+  assertEquals(v1, Math.min(v1++, v6));    // int32, tagged
+  assertEquals(v2, Math.max(v5, v2++));    // tagged, int32
+  assertEquals(v6, Math.min(v6, v9++));    // tagged, double
+  assertEquals(v0, Math.max(v0++, v5));    // double, tagged
+
   // Minus zero.
   assertEquals(Infinity, 1/Math.max(v7, v8));
   assertEquals(-Infinity, 1/Math.min(v7, v8));
   // NaN.
   assertEquals(NaN, Math.max(NaN, v8));
   assertEquals(NaN, Math.min(NaN, v9));
   assertEquals(NaN, Math.max(v8, NaN));
   assertEquals(NaN, Math.min(v9, NaN));
   // Minus zero as Integer32.
   assertEquals((arg === -0) ? -Infinity : 1, 1/Math.min(arg, v2));
@@ skipping 13 matching lines @@
 // Test overriding Math.min and Math.max
 Math.min = function(a, b) { return a + b; }
 Math.max = function(a, b) { return a - b; }
 
 function crankshaft_test_3() {
   assertEquals(8, Math.min(3, 5));
   assertEquals(3, Math.max(5, 2));
 }
 
 run(crankshaft_test_3);