Auto merge of #40256 - nagisa:compiler-builtin-no-panic-beta, r=alexc…

…richton Beta backport of #40254
rust-lang · Mar 8, 2017 · 92e7b9b · 92e7b9b
2 parents ecbf0b5 + e8d90fb
commit 92e7b9b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/libcompiler_builtins/lib.rs b/src/libcompiler_builtins/lib.rs
@@ -468,14 +468,15 @@ pub mod reimpls {
     }
 
     trait AbsExt: Sized {
-        fn uabs(self) -> u128_ {
-            self.iabs() as u128_
-        }
+        fn uabs(self) -> u128_;
         fn iabs(self) -> i128_;
     }
 
     #[cfg(stage0)]
     impl AbsExt for i128_ {
+        fn uabs(self) -> u128_ {
+            self.iabs() as u128_
+        }
         fn iabs(self) -> i128_ {
             let s = self >> 63;
             ((self ^ s).wrapping_sub(s))
@@ -484,6 +485,9 @@ pub mod reimpls {
 
     #[cfg(not(stage0))]
     impl AbsExt for i128_ {
+        fn uabs(self) -> u128_ {
+            self.iabs() as u128_
+        }
         fn iabs(self) -> i128_ {
             let s = self >> 127;
             ((self ^ s).wrapping_sub(s))