Fix math min/max for -0.0 case. Enable min_max_test to run in optimizing compiler as well.

runtime/vm/intermediate_language_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 3348 matching lines @@
     summary->set_out(Location::RequiresFpuRegister());
     return summary;
   }
   ASSERT(result_cid() == kSmiCid);
   UNIMPLEMENTED();
   return NULL;
 }
 
 
 void MathMinMaxInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+  ASSERT((op_kind() == MethodRecognizer::kMathMin) ||
+         (op_kind() == MethodRecognizer::kMathMax));
   if (result_cid() == kDoubleCid) {
-    Label done, is_nan;
+    Label done, returns_nan, are_equal;
     DRegister left = EvenDRegisterOf(locs()->in(0).fpu_reg());
     DRegister right = EvenDRegisterOf(locs()->in(1).fpu_reg());
     DRegister result = EvenDRegisterOf(locs()->out().fpu_reg());
     Register temp = locs()->temp(0).reg();
     __ vcmpd(left, right);
     __ vmstat();
-    __ b(&is_nan, VS);
-    Condition double_condition, neg_double_condition;
-    if (op_kind() == MethodRecognizer::kMathMin) {
-      double_condition = TokenKindToDoubleCondition(Token::kLT);
-      neg_double_condition = TokenKindToDoubleCondition(Token::kGTE);
-    } else {
-      ASSERT(op_kind() == MethodRecognizer::kMathMax);
-      double_condition = TokenKindToDoubleCondition(Token::kGT);
-      neg_double_condition = TokenKindToDoubleCondition(Token::kLTE);
-    }
+    __ b(&returns_nan, VS);
+    __ b(&are_equal, EQ);
+    const intptr_t is_min = (op_kind() == MethodRecognizer::kMathMin);
+    const Condition double_condition =
+        is_min ? TokenKindToDoubleCondition(Token::kLT)
+               : TokenKindToDoubleCondition(Token::kGT);
+    const Condition neg_double_condition =
+        is_min ? TokenKindToDoubleCondition(Token::kGTE)
+               : TokenKindToDoubleCondition(Token::kLTE);
     __ vmovd(result, left, double_condition);
     __ vmovd(result, right, neg_double_condition);
     __ b(&done);
 
-    __ Bind(&is_nan);
+    __ Bind(&returns_nan);
     __ LoadDImmediate(result, NAN, temp);
+    __ b(&done);
+
+    __ Bind(&are_equal);
+    // Check for negative zero: -0.0 is equal 0.0 but min or max must return
+    // -0.0 or 0.0 respectively.
+    // Check for negative left value (get the sign bit):
+    // - min -> left is negative ? left : right.
+    // - max -> left is negative ? right : left
+    // Check the sign bit.
+    __ vmovrrd(IP, temp, left);  // Sign bit is in bit 31 of temp.
+    __ mov(temp, ShifterOperand(temp, LSR, 31));
+    __ tst(temp, ShifterOperand(1));  // NE -> is negative.

[regis, 2013/07/22 20:55:11]

You do not need to sign extend to test the sign bit. A single instruction is
enough:
__ cmp(temp, ShifterOperand(0));
The use LT and GE as conditions.

[srdjan, 2013/07/22 21:10:16]

Done.

+    if (is_min) {
+      __ vmovd(result, left, NE);
+      __ vmovd(result, right, EQ);
+    } else {
+      __ vmovd(result, right, NE);
+      __ vmovd(result, left, EQ);
+    }
+
     __ Bind(&done);
     return;
   }
   ASSERT(result_cid() == kSmiCid);
   UNIMPLEMENTED();
 }
 
 
 LocationSummary* UnarySmiOpInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
@@ skipping 686 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM