Further and hopefully final Windows fixes

6 files changed, 199 insertions, 180 deletions

diff --git a/src/libcompiler_builtins/lib.rs b/src/libcompiler_builtins/lib.rs
index 1c625ea9855..e9094a2ef32 100644
--- a/src/libcompiler_builtins/lib.rs
+++ b/src/libcompiler_builtins/lib.rs
@@ -19,11 +19,12 @@
 #![feature(staged_api)]
 #![cfg_attr(any(target_pointer_width="32", target_pointer_width="16", target_os="windows",
             target_arch="mips64"),
-            feature(core_intrinsics, core_float, repr_simd))]
+            feature(core_intrinsics, repr_simd))]
 #![feature(associated_consts)]
-#![cfg_attr(not(stage0), feature(i128_type))]
+#![cfg_attr(not(stage0), feature(i128_type, core_float, abi_unadjusted))]
 
-#![allow(non_camel_case_types, unused_variables)]
+#![allow(non_camel_case_types, unused_variables, unused_imports)]
+#![cfg_attr(stage0, allow(dead_code))]
 
 #[cfg(any(target_pointer_width="32", target_pointer_width="16", target_os="windows",
           target_arch="mips64"))]
@@ -46,29 +47,6 @@ pub mod reimpls {
     #[cfg(not(stage0))]
     type i128_ = i128;
 
-    // Unfortunately, every tool on Windows expects different
-    // calling conventions to be met for int128. We need to
-    // match here what LLVM expects from us. This is only
-    // required for the return type!
-    #[cfg(not(stage0))]
-    #[cfg(all(windows, target_pointer_width="64"))]
-    #[repr(simd)]
-    pub struct u64x2(u64, u64);
-
-    #[cfg(not(stage0))]
-    #[cfg(all(windows, target_pointer_width="64"))]
-    type u128ret = u64x2;
-
-    #[cfg(any(not(all(windows, target_pointer_width="64")),stage0))]
-    type u128ret = u128_;
-
-    #[cfg(not(stage0))]
-    #[cfg(all(windows, target_pointer_width="64"))]
-    type i128ret = u64x2;
-
-    #[cfg(any(not(all(windows, target_pointer_width="64")),stage0))]
-    type i128ret = i128_;
-
     macro_rules! ashl {
         ($a:expr, $b:expr, $ty:ty) => {{
             let (a, b) = ($a, $b);
@@ -137,27 +115,22 @@ pub mod reimpls {
 
 
     #[export_name="__lshrti3"]
-    pub extern "C" fn lshr(a: u128_, b: u128_) -> u128ret {
-        lshr!(a, b, u128_).to_ret()
-    }
-
-    #[export_name="__udivmodti4"]
-    pub extern "C" fn u128_div_mod_export(n: u128_, d: u128_, rem: *mut u128_) -> u128ret {
-        u128_div_mod(n, d, rem).to_ret()
+    pub extern "C" fn lshr(a: u128_, b: u128_) -> u128_ {
+        lshr!(a, b, u128_)
     }
 
     #[cfg(stage0)]
-    pub extern "C" fn u128_div_mod(n: u128_, d: u128_, rem: *mut u128_) -> u128ret {
+    pub extern "C" fn u128_div_mod(n: u128_, d: u128_, rem: *mut u128_) -> u128_ {
         unsafe {
         if !rem.is_null() {
             *rem = unchecked_rem(n, d);
         }
-        unchecked_div(n, d).to_ret()
+        unchecked_div(n, d)
         }
     }
 
     #[cfg(not(stage0))]
-    pub extern "C" fn u128_div_mod(n: u128_, d: u128_, rem: *mut u128_) -> u128 {
+    pub extern "C" fn u128_div_mod(n: u128_, d: u128_, rem: *mut u128_) -> u128_ {
         // Translated from Figure 3-40 of The PowerPC Compiler Writer's Guide
         unsafe {
         // special cases, X is unknown, K != 0
@@ -322,29 +295,18 @@ pub mod reimpls {
         }
     }
 
-    #[export_name="__umodti3"]
-    pub extern "C" fn u128_mod(a: u128_, b: u128_) -> u128ret {
-        unsafe {
-            let mut r = ::core::mem::zeroed();
-            u128_div_mod(a, b, &mut r);
-            r.to_ret()
-        }
-    }
-
-    #[export_name="__modti3"]
-    pub extern "C" fn i128_mod(a: i128_, b: i128_) -> i128ret {
+    fn i128_mod(a: i128_, b: i128_) -> i128_ {
         let b = b.uabs();
         let sa = a.signum();
         let a = a.uabs();
-        (unsafe {
+        unsafe {
             let mut r = ::core::mem::zeroed();
             u128_div_mod(a, b, &mut r);
             if sa == -1 { (r as i128_).unchecked_neg() } else { r as i128_ }
-        }).to_ret()
+        }
     }
 
-    #[export_name="__divti3"]
-    pub extern "C" fn i128_div(a: i128_, b: i128_) -> i128ret {
+    fn i128_div(a: i128_, b: i128_) -> i128_ {
         let sa = a.signum();
         let sb = b.signum();
         let a = a.uabs();
@@ -354,19 +316,13 @@ pub mod reimpls {
             (u128_div_mod(a, b, ptr::null_mut()) as i128_).unchecked_neg()
         } else {
             u128_div_mod(a, b, ptr::null_mut()) as i128_
-        }).to_ret()
+        })
     }
 
     #[cfg(stage0)]
     #[export_name="__udivti3"]
-    pub extern "C" fn u128_div(a: u128_, b: u128_) -> u128ret {
-        (a / b).to_ret()
-    }
-
-    #[cfg(not(stage0))]
-    #[export_name="__udivti3"]
-    pub extern "C" fn u128_div(a: u128_, b: u128_) -> u128ret {
-        u128_div_mod(a, b, ptr::null_mut()).to_ret()
+    pub extern "C" fn u128_div(a: u128_, b: u128_) -> u128_ {
+        (a / b)
     }
 
     macro_rules! mulo {
@@ -394,7 +350,6 @@ pub mod reimpls {
             if abs_a < 2 || abs_b < 2 {
                 return result;
             }
-            unsafe {
             if sa == sb {
                 if abs_a > unchecked_div(<$ty>::max_value(), abs_b) {
                     *overflow = 1;
@@ -404,32 +359,21 @@ pub mod reimpls {
                     *overflow = 1;
                 }
             }
-            }
             result
         }}
     }
 
-    // FIXME: i32 here should be c_int.
-    #[cfg_attr(not(all(windows, target_pointer_width="64", not(stage0))),
-               export_name="__muloti4")]
-    pub extern "C" fn i128_mul_oflow(a: i128_, b: i128_, o: &mut i32) -> i128 {
-        mulo!(a, b, o, i128_)
-    }
-
     pub trait LargeInt {
         type LowHalf;
         type HighHalf;
-        type Ret;
 
         fn low(self) -> Self::LowHalf;
         fn high(self) -> Self::HighHalf;
         fn from_parts(low: Self::LowHalf, high: Self::HighHalf) -> Self;
-        fn to_ret(self) -> Self::Ret;
     }
     impl LargeInt for u64 {
         type LowHalf = u32;
         type HighHalf = u32;
-        type Ret = u64;
 
         fn low(self) -> u32 {
             self as u32
@@ -440,14 +384,10 @@ pub mod reimpls {
         fn from_parts(low: u32, high: u32) -> u64 {
             low as u64 | (high as u64).wrapping_shl(32)
         }
-        fn to_ret(self) -> u64 {
-            self
-        }
     }
     impl LargeInt for i64 {
         type LowHalf = u32;
         type HighHalf = i32;
-        type Ret = i64;
 
         fn low(self) -> u32 {
             self as u32
@@ -458,15 +398,11 @@ pub mod reimpls {
         fn from_parts(low: u32, high: i32) -> i64 {
             low as i64 | (high as i64).wrapping_shl(32)
         }
-        fn to_ret(self) -> i64 {
-            self
-        }
     }
     #[cfg(not(stage0))]
     impl LargeInt for u128 {
         type LowHalf = u64;
         type HighHalf = u64;
-        type Ret = u128ret;
 
         fn low(self) -> u64 {
             self as u64
@@ -478,20 +414,11 @@ pub mod reimpls {
             #[repr(C, packed)] struct Parts(u64, u64);
             unsafe { ::core::mem::transmute(Parts(low, high)) }
         }
-        #[cfg(not(all(windows, target_pointer_width="64")))]
-        fn to_ret(self) -> u128ret {
-            self
-        }
-        #[cfg(all(windows, target_pointer_width="64"))]
-        fn to_ret(self) -> u128ret {
-            u64x2(self.low(), self.high())
-        }
     }
     #[cfg(not(stage0))]
     impl LargeInt for i128 {
         type LowHalf = u64;
         type HighHalf = i64;
-        type Ret = i128ret;
 
         fn low(self) -> u64 {
             self as u64
@@ -502,14 +429,6 @@ pub mod reimpls {
         fn from_parts(low: u64, high: i64) -> i128 {
             u128::from_parts(low, high as u64) as i128
         }
-        #[cfg(not(all(windows, target_pointer_width="64")))]
-        fn to_ret(self) -> i128ret {
-            self
-        }
-        #[cfg(all(windows, target_pointer_width="64"))]
-        fn to_ret(self) -> i128ret {
-            u64x2(self.low(), self.high() as u64)
-        }
     }
 
     macro_rules! mul {
@@ -543,14 +462,14 @@ pub mod reimpls {
 
     #[cfg(stage0)]
     #[export_name="__multi3"]
-    pub extern "C" fn u128_mul(a: i128_, b: i128_) -> i128ret {
-        ((a as i64).wrapping_mul(b as i64) as i128_).to_ret()
+    pub extern "C" fn u128_mul(a: i128_, b: i128_) -> i128_ {
+        ((a as i64).wrapping_mul(b as i64) as i128_)
     }
 
     #[cfg(not(stage0))]
     #[export_name="__multi3"]
-    pub extern "C" fn u128_mul(a: i128_, b: i128_) -> i128ret {
-        mul!(a, b, i128_, i64).to_ret()
+    pub extern "C" fn u128_mul(a: i128_, b: i128_) -> i128_ {
+        mul!(a, b, i128_, i64)
     }
 
     trait AbsExt: Sized {
@@ -628,9 +547,9 @@ pub mod reimpls {
             let exponent = $from.get_exponent();
             let mantissa_fraction = repr & <$fromty as FloatStuff>::MANTISSA_MASK;
             let mantissa = mantissa_fraction | <$fromty as FloatStuff>::MANTISSA_LEAD_BIT;
-            if sign == -1.0 || exponent < 0 { return (0 as u128_).to_ret(); }
+            if sign == -1.0 || exponent < 0 { return 0 as u128_; }
             if exponent > ::core::mem::size_of::<$outty>() as i32 * 8 {
-                return (!(0 as u128_)).to_ret();
+                return !(0 as u128_);
             }
             (if exponent < (<$fromty as FloatStuff>::MANTISSA_BITS) as i32 {
                 (mantissa as $outty)
@@ -640,20 +559,10 @@ pub mod reimpls {
                 (mantissa as $outty)
                     .wrapping_shl(exponent.wrapping_sub(
                         <$fromty as FloatStuff>::MANTISSA_BITS as i32) as u32)
-            }).to_ret()
+            })
         } }
     }
 
-    #[export_name="__fixunsdfti"]
-    pub extern "C" fn f64_as_u128(a: f64) -> u128ret {
-        float_as_unsigned!(a, f64, u128_)
-    }
-
-    #[export_name="__fixunssfti"]
-    pub extern "C" fn f32_as_u128(a: f32) -> u128ret {
-        float_as_unsigned!(a, f32, u128_)
-    }
-
     macro_rules! float_as_signed {
         ($from: expr, $fromty: ty, $outty: ty) => {{
             use core::num::Float;
@@ -663,10 +572,10 @@ pub mod reimpls {
             let mantissa_fraction = repr & <$fromty as FloatStuff>::MANTISSA_MASK;
             let mantissa = mantissa_fraction | <$fromty as FloatStuff>::MANTISSA_LEAD_BIT;
 
-            if exponent < 0 { return (0 as i128_).to_ret(); }
+            if exponent < 0 { return 0 as i128_; }
             if exponent > ::core::mem::size_of::<$outty>() as i32 * 8 {
                 let ret = if sign > 0.0 { <$outty>::max_value() } else { <$outty>::min_value() };
-                return ret.to_ret();
+                return ret
             }
             let r = if exponent < (<$fromty as FloatStuff>::MANTISSA_BITS) as i32 {
                 (mantissa as $outty)
@@ -677,62 +586,12 @@ pub mod reimpls {
                     .wrapping_shl(exponent.wrapping_sub(
                         <$fromty as FloatStuff>::MANTISSA_BITS as i32) as u32)
             };
-            (if sign >= 0.0 { r } else { r.unchecked_neg() }).to_ret()
+            (if sign >= 0.0 { r } else { r.unchecked_neg() })
         }}
     }
 
-    #[export_name="__fixdfti"]
-    pub extern "C" fn f64_as_i128(a: f64) -> i128ret {
-        float_as_signed!(a, f64, i128_)
-    }
 
-    #[export_name="__fixsfti"]
-    pub extern "C" fn f32_as_i128(a: f32) -> i128ret {
-        float_as_signed!(a, f32, i128_)
-    }
-
-    // LLVM expectations for ABI on windows are pure madness.
-
-    #[cfg(not(stage0))]
-    #[cfg(all(windows, target_pointer_width="64"))]
-    mod windows_64_workarounds {
-        use super::{i128_, u128_, LargeInt};
-        use super::{i128_as_f64, i128_as_f32, u128_as_f64, u128_as_f32, i128_mul_oflow};
-
-        #[export_name="__muloti4"]
-        pub extern "C" fn i128_mul_oflow_win(alow: u64, ahigh: i64,
-                                             blow: u64, bhigh: i64, o: &mut i32) -> i128 {
-            i128_mul_oflow(i128_::from_parts(alow, ahigh), i128_::from_parts(blow, bhigh), o)
-        }
-
-        #[export_name="__floattidf"]
-        pub extern "C" fn i128_as_f64_win(alow: u64, ahigh: i64) -> f64 {
-            i128_as_f64(i128_::from_parts(alow, ahigh))
-        }
-
-        #[export_name="__floattisf"]
-        pub extern "C" fn i128_as_f32_win(alow: u64, ahigh: i64) -> f32 {
-            i128_as_f32(i128_::from_parts(alow, ahigh))
-        }
-
-        #[export_name="__floatuntidf"]
-        pub extern "C" fn u128_as_f64_win(alow: u64, ahigh: u64) -> f64 {
-            u128_as_f64(u128_::from_parts(alow, ahigh))
-        }
-
-        #[export_name="__floatuntisf"]
-        pub extern "C" fn u128_as_f32_win(alow: u64, ahigh: u64) -> f32 {
-            u128_as_f32(u128_::from_parts(alow, ahigh))
-        }
-    }
-    #[cfg(not(stage0))]
-    #[cfg(all(windows, target_pointer_width="64"))]
-    pub use self::windows_64_workarounds::*;
-
-
-    #[cfg_attr(not(all(windows, target_pointer_width="64", not(stage0))),
-               export_name="__floattidf")]
-    pub extern "C" fn i128_as_f64(a: i128_) -> f64 {
+    fn i128_as_f64(a: i128_) -> f64 {
         match a.signum() {
             1 => u128_as_f64(a.uabs()),
             0 => 0.0,
@@ -740,9 +599,7 @@ pub mod reimpls {
         }
     }
 
-    #[cfg_attr(not(all(windows, target_pointer_width="64", not(stage0))),
-               export_name="__floattisf")]
-    pub extern "C" fn i128_as_f32(a: i128_) -> f32 {
+    fn i128_as_f32(a: i128_) -> f32 {
         match a.signum() {
             1 => u128_as_f32(a.uabs()),
             0 => 0.0,
@@ -750,9 +607,7 @@ pub mod reimpls {
         }
     }
 
-    #[cfg_attr(not(all(windows, target_pointer_width="64", not(stage0))),
-               export_name="__floatuntidf")]
-    pub extern "C" fn u128_as_f64(mut a: u128_) -> f64 {
+    fn u128_as_f64(mut a: u128_) -> f64 {
         use ::core::f64::MANTISSA_DIGITS;
         if a == 0 { return 0.0; }
         let sd = 128u32.wrapping_sub(a.leading_zeros());
@@ -787,9 +642,7 @@ pub mod reimpls {
         }
     }
 
-    #[cfg_attr(not(all(windows, target_pointer_width="64", not(stage0))),
-               export_name="__floatuntisf")]
-    pub extern "C" fn u128_as_f32(mut a: u128_) -> f32 {
+    fn u128_as_f32(mut a: u128_) -> f32 {
         use ::core::f32::MANTISSA_DIGITS;
         if a == 0 { return 0.0; }
         let sd = 128u32.wrapping_sub(a.leading_zeros());
@@ -823,4 +676,122 @@ pub mod reimpls {
                                    | (a as u32 & 0x007f_ffff))
         }
     }
+
+
+    macro_rules! why_are_abi_strings_checked_by_parser { ($cret:ty, $conv:expr, $unadj:tt) => {
+    mod imp {
+        use super::{i128_, u128_, LargeInt, FloatStuff, NegExt, AbsExt};
+        use super::{i128_as_f64, i128_as_f32, u128_as_f64, u128_as_f32,
+                    i128_div, i128_mod, u128_div_mod, unchecked_div, ptr};
+        // For x64
+        // rdx:rcx, r9:r8, stack -> rdx:rax
+        // aka.
+        // define i128 @__muloti4(i128, i128, i32*)
+        #[export_name="__muloti4"]
+        pub unsafe extern $unadj fn i128_mul_oflow(a: i128_, b: i128_, o: *mut i32) -> i128_ {
+            mulo!(a, b, o, i128_)
+        }
+
+        // For x64
+        // rdx:rax -> xmm0
+        // aka.
+        // define double @__muloti4(i128)
+        #[export_name="__floattidf"]
+        pub extern $unadj fn i128_as_f64_(a: i128_) -> f64 {
+            i128_as_f64(a)
+        }
+        #[export_name="__floattisf"]
+        pub extern $unadj fn i128_as_f32_(a: i128_) -> f32 {
+            i128_as_f32(a)
+        }
+        #[export_name="__floatuntidf"]
+        pub extern $unadj fn u128_as_f64_(a: u128_) -> f64 {
+            u128_as_f64(a)
+        }
+        #[export_name="__floatuntisf"]
+        pub extern $unadj fn u128_as_f32_(a: u128_) -> f32 {
+            u128_as_f32(a)
+        }
+
+        // For x64
+        // xmm0 -> rdx:rax
+        // aka.
+        // define i128 @stuff(double)
+        #[export_name="__fixunsdfti"]
+        pub extern $unadj fn f64_as_u128(a: f64) -> u128_ {
+            float_as_unsigned!(a, f64, u128_)
+        }
+
+        #[export_name="__fixunssfti"]
+        pub extern "unadjusted" fn f32_as_u128(a: f32) -> u128_ {
+            float_as_unsigned!(a, f32, u128_)
+        }
+
+        #[export_name="__fixdfti"]
+        pub extern "unadjusted" fn f64_as_i128(a: f64) -> i128_ {
+            float_as_signed!(a, f64, i128_)
+        }
+
+        #[export_name="__fixsfti"]
+        pub extern "unadjusted" fn f32_as_i128(a: f32) -> i128_ {
+            float_as_signed!(a, f32, i128_)
+        }
+
+        #[repr(simd)]
+        pub struct u64x2(u64, u64);
+
+        // For x64
+        // pointers -> xmm0
+        // aka.
+        // define <2 x u64> @stuff(i128*, i128*, i128*)
+        //
+        // That almost matches the C ABI, so we simply use the C ABI
+        #[export_name="__udivmodti4"]
+        pub extern "C" fn u128_div_mod_(n: u128_, d: u128_, rem: *mut u128_) -> $cret {
+            let x = u128_div_mod(n, d, rem);
+            ($conv)(x)
+        }
+
+        #[export_name="__udivti3"]
+        pub extern "C" fn u128_div_(a: u128_, b: u128_) -> $cret {
+            let x = u128_div_mod(a, b, ptr::null_mut());
+            ($conv)(x)
+        }
+
+        #[export_name="__umodti3"]
+        pub extern "C" fn u128_mod_(a: u128_, b: u128_) -> $cret {
+            unsafe {
+                let mut r = ::core::mem::zeroed();
+                u128_div_mod(a, b, &mut r);
+                ($conv)(r)
+            }
+        }
+
+        #[export_name="__divti3"]
+        pub extern "C" fn i128_div_(a: i128_, b: i128_) -> $cret {
+            let x = i128_div(a, b);
+            ($conv)(x as u128_)
+        }
+
+        #[export_name="__modti3"]
+        pub extern "C" fn i128_mod_(a: i128_, b: i128_) -> $cret {
+            let x = i128_mod(a, b);
+            ($conv)(x as u128_)
+        }
+    }
+    } }
+
+    // LLVM expectations for ABI on windows x64 are pure madness.
+    #[cfg(not(stage0))]
+    #[cfg(all(windows, target_pointer_width="64"))]
+    why_are_abi_strings_checked_by_parser!(u64x2,
+                                           |i: u128_| u64x2(i.low(), i.high()),
+                                           "unadjusted");
+
+    #[cfg(not(stage0))]
+    #[cfg(not(all(windows, target_pointer_width="64")))]
+    why_are_abi_strings_checked_by_parser!(u128_, |i|{ i }, "C");
+
+    #[cfg(not(stage0))]
+    pub use self::imp::*;
 }
diff --git a/src/librustc_trans/abi.rs b/src/librustc_trans/abi.rs
index 81e4b4d1f21..3fba75bc253 100644
--- a/src/librustc_trans/abi.rs
+++ b/src/librustc_trans/abi.rs
@@ -352,6 +352,7 @@ impl FnType {
             Fastcall => llvm::X86FastcallCallConv,
             Vectorcall => llvm::X86_VectorCall,
             C => llvm::CCallConv,
+            Unadjusted => llvm::CCallConv,
             Win64 => llvm::X86_64_Win64,
             SysV64 => llvm::X86_64_SysV,
             Aapcs => llvm::ArmAapcsCallConv,
@@ -528,6 +529,8 @@ impl FnType {
                                     ccx: &CrateContext<'a, 'tcx>,
                                     abi: Abi,
                                     sig: &ty::FnSig<'tcx>) {
+        if abi == Abi::Unadjusted { return }
+
         if abi == Abi::Rust || abi == Abi::RustCall ||
            abi == Abi::RustIntrinsic || abi == Abi::PlatformIntrinsic {
             let fixup = |arg: &mut ArgType| {
diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs
index 0cc62fb43a5..75554f20eff 100644
--- a/src/libsyntax/abi.rs
+++ b/src/libsyntax/abi.rs
@@ -50,6 +50,7 @@ pub enum Abi {
     RustIntrinsic,
     RustCall,
     PlatformIntrinsic,
+    Unadjusted
 }
 
 #[allow(non_camel_case_types)]
@@ -92,6 +93,7 @@ const AbiDatas: &'static [AbiData] = &[
     AbiData {abi: Abi::RustIntrinsic, name: "rust-intrinsic", generic: true },
     AbiData {abi: Abi::RustCall, name: "rust-call", generic: true },
     AbiData {abi: Abi::PlatformIntrinsic, name: "platform-intrinsic", generic: true },
+    AbiData {abi: Abi::Unadjusted, name: "unadjusted", generic: true },
 ];
 
 /// Returns the ABI with the given name (if any).
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index a3ecdabbe1c..e7df454cf6a 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -324,6 +324,9 @@ declare_features! (
 
     // The `i128` type
     (active, i128_type, "1.16.0", Some(35118)),
+
+    // The `unadjusted` ABI. Perma unstable.
+    (active, abi_unadjusted, "1.16.0", None),
 );
 
 declare_features! (
@@ -995,7 +998,11 @@ impl<'a> PostExpansionVisitor<'a> {
             Abi::PtxKernel => {
                 gate_feature_post!(&self, abi_ptx, span,
                                    "PTX ABIs are experimental and subject to change");
-            }
+            },
+            Abi::Unadjusted => {
+                gate_feature_post!(&self, abi_unadjusted, span,
+                                   "unadjusted ABI is an implementation detail and perma-unstable");
+            },
             // Stable
             Abi::Cdecl |
             Abi::Stdcall |
diff --git a/src/test/run-pass/i128.rs b/src/test/run-pass/i128.rs
index 4799f0d68bf..71d3e6491cb 100644
--- a/src/test/run-pass/i128.rs
+++ b/src/test/run-pass/i128.rs
@@ -10,7 +10,10 @@
 
 // ignore-stage0
 // ignore-stage1
-#![feature(i128_type)]
+#![feature(i128_type, test)]
+
+extern crate test;
+use test::black_box as b;
 
 fn main() {
     let x: i128 = -1;
@@ -45,6 +48,39 @@ fn main() {
     assert_eq!((-z as f32) as i128, -z);
     assert_eq!((-z as f64 * 16.0) as i128, -z * 16);
     assert_eq!((-z as f32 * 16.0) as i128, -z * 16);
+    // Same stuff as above, but blackboxed, to force use of intrinsics
+    let x: i128 = b(-1);
+    assert_eq!(0, !x);
+    let y: i128 = b(-2);
+    assert_eq!(!1, y);
+    let z: i128 = b(0xABCD_EF);
+    assert_eq!(z * z, 0x734C_C2F2_A521);
+    assert_eq!(z * z * z * z, 0x33EE_0E2A_54E2_59DA_A0E7_8E41);
+    assert_eq!(-z * -z, 0x734C_C2F2_A521);
+    assert_eq!(-z * -z * -z * -z, 0x33EE_0E2A_54E2_59DA_A0E7_8E41);
+    assert_eq!(-z + -z + -z + -z, -0x2AF3_7BC);
+    let k: i128 = b(-0x1234_5678_9ABC_DEFF_EDCB_A987_6543_210);
+    assert_eq!(k + k, -0x2468_ACF1_3579_BDFF_DB97_530E_CA86_420);
+    assert_eq!(0, k - k);
+    assert_eq!(-0x1234_5678_9ABC_DEFF_EDCB_A987_5A86_421, k + z);
+    assert_eq!(-0x1000_0000_0000_0000_0000_0000_0000_000,
+               k + 0x234_5678_9ABC_DEFF_EDCB_A987_6543_210);
+    assert_eq!(-0x6EF5_DE4C_D3BC_2AAA_3BB4_CC5D_D6EE_8, k / 42);
+    assert_eq!(-k, k / -1);
+    assert_eq!(-0x91A2_B3C4_D5E6_F8, k >> 65);
+    assert_eq!(-0xFDB9_7530_ECA8_6420_0000_0000_0000_0000, k << 65);
+    assert!(k < z);
+    assert!(y > k);
+    assert!(y < x);
+    assert_eq!(x as i64, -1);
+    assert_eq!(z as i64, 0xABCD_EF);
+    assert_eq!(k as i64, -0xFEDC_BA98_7654_3210);
+    assert_eq!(k as u128, 0xFEDC_BA98_7654_3210_0123_4567_89AB_CDF0);
+    assert_eq!(-k as u128, 0x1234_5678_9ABC_DEFF_EDCB_A987_6543_210);
+    assert_eq!((-z as f64) as i128, -z);
+    assert_eq!((-z as f32) as i128, -z);
+    assert_eq!((-z as f64 * 16.0) as i128, -z * 16);
+    assert_eq!((-z as f32 * 16.0) as i128, -z * 16);
     // formatting
     let j: i128 = -(1 << 67);
     assert_eq!("-147573952589676412928", format!("{}", j));
diff --git a/src/test/ui/codemap_tests/unicode.stderr b/src/test/ui/codemap_tests/unicode.stderr
index 70fe17888e8..f71ef126b64 100644
--- a/src/test/ui/codemap_tests/unicode.stderr
+++ b/src/test/ui/codemap_tests/unicode.stderr
@@ -1,4 +1,4 @@
-error: invalid ABI: expected one of [cdecl, stdcall, fastcall, vectorcall, aapcs, win64, sysv64, ptx-kernel, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic], found `路濫狼á́́`
+error: invalid ABI: expected one of [cdecl, stdcall, fastcall, vectorcall, aapcs, win64, sysv64, ptx-kernel, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic, unadjusted], found `路濫狼á́́`
   --> $DIR/unicode.rs:11:8
    |
 11 | extern "路濫狼á́́" fn foo() {}