Auto merge of #47080 - varkor:contrib-12, r=rkruppe

bors · bors · commit 54d7285a349a · 2017-12-31T00:09:18.000Z
Optimise min/max Swapping the conditions generates more efficient x86 assembly. See #46926 (comment). r? @rkruppe
diff --git a/src/libcore/num/f32.rs b/src/libcore/num/f32.rs
@@ -263,7 +263,7 @@ impl Float for f32 {
         // Since we do not support sNaN in Rust yet, we do not need to handle them.
         // FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
         // multiplying by 1.0. Should switch to the `canonicalize` when it works.
-        (if self < other || self.is_nan() { other } else { self }) * 1.0
+        (if self.is_nan() || self < other { other } else { self }) * 1.0
     }
 
     /// Returns the minimum of the two numbers.
@@ -277,6 +277,6 @@ impl Float for f32 {
         // Since we do not support sNaN in Rust yet, we do not need to handle them.
         // FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
         // multiplying by 1.0. Should switch to the `canonicalize` when it works.
-        (if self < other || other.is_nan() { self } else { other }) * 1.0
+        (if other.is_nan() || self < other { self } else { other }) * 1.0
     }
 }
diff --git a/src/libcore/num/f64.rs b/src/libcore/num/f64.rs
@@ -261,7 +261,7 @@ impl Float for f64 {
         // Since we do not support sNaN in Rust yet, we do not need to handle them.
         // FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
         // multiplying by 1.0. Should switch to the `canonicalize` when it works.
-        (if self < other || self.is_nan() { other } else { self }) * 1.0
+        (if self.is_nan() || self < other { other } else { self }) * 1.0
     }
 
     /// Returns the minimum of the two numbers.
@@ -275,6 +275,6 @@ impl Float for f64 {
         // Since we do not support sNaN in Rust yet, we do not need to handle them.
         // FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by
         // multiplying by 1.0. Should switch to the `canonicalize` when it works.
-        (if self < other || other.is_nan() { self } else { other }) * 1.0
+        (if other.is_nan() || self < other { self } else { other }) * 1.0
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ impl Float for f32 {`
`263`	`263`	`// Since we do not support sNaN in Rust yet, we do not need to handle them.`
`264`	`264`	`// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by`
`265`	`265`	// multiplying by 1.0. Should switch to the `canonicalize` when it works.
`266`		`- (if self < other \|\| self.is_nan() { other } else { self }) * 1.0`
	`266`	`+ (if self.is_nan() \|\| self < other { other } else { self }) * 1.0`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`/// Returns the minimum of the two numbers.`
`@@ -277,6 +277,6 @@ impl Float for f32 {`
`277`	`277`	`// Since we do not support sNaN in Rust yet, we do not need to handle them.`
`278`	`278`	`// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by`
`279`	`279`	// multiplying by 1.0. Should switch to the `canonicalize` when it works.
`280`		`- (if self < other \|\| other.is_nan() { self } else { other }) * 1.0`
	`280`	`+ (if other.is_nan() \|\| self < other { self } else { other }) * 1.0`
`281`	`281`	`}`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ impl Float for f64 {`
`261`	`261`	`// Since we do not support sNaN in Rust yet, we do not need to handle them.`
`262`	`262`	`// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by`
`263`	`263`	// multiplying by 1.0. Should switch to the `canonicalize` when it works.
`264`		`- (if self < other \|\| self.is_nan() { other } else { self }) * 1.0`
	`264`	`+ (if self.is_nan() \|\| self < other { other } else { self }) * 1.0`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`/// Returns the minimum of the two numbers.`
`@@ -275,6 +275,6 @@ impl Float for f64 {`
`275`	`275`	`// Since we do not support sNaN in Rust yet, we do not need to handle them.`
`276`	`276`	`// FIXME(nagisa): due to https://bugs.llvm.org/show_bug.cgi?id=33303 we canonicalize by`
`277`	`277`	// multiplying by 1.0. Should switch to the `canonicalize` when it works.
`278`		`- (if self < other \|\| other.is_nan() { self } else { other }) * 1.0`
	`278`	`+ (if other.is_nan() \|\| self < other { self } else { other }) * 1.0`
`279`	`279`	`}`
`280`	`280`	`}`