Auto merge of #27948 - wthrowe:f64-sqrt, r=alexcrichton

This fixes a reappearance of bug #9987 introduced in 1ddee80, which caused f64::tests::test_sqrt_domain to fail (at least on some systems).
rust-lang · Aug 23, 2015 · c69c29b · c69c29b
2 parents 568b13e + 5e9008d
commit c69c29b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
@@ -454,7 +454,11 @@ impl f64 {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn sqrt(self) -> f64 {
-        unsafe { intrinsics::sqrtf64(self) }
+        if self < 0.0 {
+            NAN
+        } else {
+            unsafe { intrinsics::sqrtf64(self) }
+        }
     }
 
     /// Returns `e^(self)`, (the exponential function).