diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index 7508257f7806f..40df2db065dfd 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -1343,7 +1343,7 @@ extern "rust-intrinsic" {
     /// use std::intrinsics::ctlz;
     ///
     /// let x = 0b0001_1100_u8;
-    /// let num_leading = unsafe { ctlz(x) };
+    /// let num_leading = ctlz(x);
     /// assert_eq!(num_leading, 3);
     /// ```
     ///
@@ -1355,7 +1355,7 @@ extern "rust-intrinsic" {
     /// use std::intrinsics::ctlz;
     ///
     /// let x = 0u16;
-    /// let num_leading = unsafe { ctlz(x) };
+    /// let num_leading = ctlz(x);
     /// assert_eq!(num_leading, 16);
     /// ```
     pub fn ctlz<T>(x: T) -> T;
@@ -1386,7 +1386,7 @@ extern "rust-intrinsic" {
     /// use std::intrinsics::cttz;
     ///
     /// let x = 0b0011_1000_u8;
-    /// let num_trailing = unsafe { cttz(x) };
+    /// let num_trailing = cttz(x);
     /// assert_eq!(num_trailing, 3);
     /// ```
     ///
@@ -1398,7 +1398,7 @@ extern "rust-intrinsic" {
     /// use std::intrinsics::cttz;
     ///
     /// let x = 0u16;
-    /// let num_trailing = unsafe { cttz(x) };
+    /// let num_trailing = cttz(x);
     /// assert_eq!(num_trailing, 16);
     /// ```
     pub fn cttz<T>(x: T) -> T;
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 4b115a178d8be..49cc5b6c06f41 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -71,7 +71,7 @@
 #![feature(cfg_target_has_atomic)]
 #![feature(concat_idents)]
 #![feature(const_fn)]
-#![feature(const_int_ops)]
+#![cfg_attr(stage0, feature(const_int_ops))]
 #![feature(const_fn_union)]
 #![feature(custom_attribute)]
 #![feature(doc_cfg)]
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 7f087532e8b3b..7ff04410516a3 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -275,7 +275,7 @@ $EndFeature, "
 ```
 "),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn count_ones(self) -> u32 { (self as $UnsignedT).count_ones() }
         }
@@ -291,7 +291,7 @@ Basic usage:
 ", $Feature, "assert_eq!(", stringify!($SelfT), "::max_value().count_zeros(), 1);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn count_zeros(self) -> u32 {
                 (!self).count_ones()
@@ -312,7 +312,7 @@ assert_eq!(n.leading_zeros(), 0);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn leading_zeros(self) -> u32 {
                 (self as $UnsignedT).leading_zeros()
@@ -333,7 +333,7 @@ assert_eq!(n.trailing_zeros(), 2);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn trailing_zeros(self) -> u32 {
                 (self as $UnsignedT).trailing_zeros()
@@ -404,7 +404,7 @@ let m = n.swap_bytes();
 assert_eq!(m, ", $swapped, ");
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn swap_bytes(self) -> Self {
                 (self as $UnsignedT).swap_bytes() as Self
@@ -454,7 +454,7 @@ if cfg!(target_endian = \"big\") {
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn from_be(x: Self) -> Self {
                 #[cfg(target_endian = "big")]
@@ -488,7 +488,7 @@ if cfg!(target_endian = \"little\") {
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn from_le(x: Self) -> Self {
                 #[cfg(target_endian = "little")]
@@ -522,7 +522,7 @@ if cfg!(target_endian = \"big\") {
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn to_be(self) -> Self { // or not to be?
                 #[cfg(target_endian = "big")]
@@ -556,7 +556,7 @@ if cfg!(target_endian = \"little\") {
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn to_le(self) -> Self {
                 #[cfg(target_endian = "little")]
@@ -2234,10 +2234,13 @@ Basic usage:
 assert_eq!(n.count_ones(), 3);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn count_ones(self) -> u32 {
+                #[cfg(stage0)]
                 unsafe { intrinsics::ctpop(self as $ActualT) as u32 }
+                #[cfg(not(stage0))]
+                { intrinsics::ctpop(self as $ActualT) as u32 }
             }
         }
 
@@ -2252,7 +2255,7 @@ Basic usage:
 ", $Feature, "assert_eq!(", stringify!($SelfT), "::max_value().count_zeros(), 0);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn count_zeros(self) -> u32 {
                 (!self).count_ones()
@@ -2272,10 +2275,13 @@ Basic usage:
 assert_eq!(n.leading_zeros(), 2);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn leading_zeros(self) -> u32 {
+                #[cfg(stage0)]
                 unsafe { intrinsics::ctlz(self as $ActualT) as u32 }
+                #[cfg(not(stage0))]
+                { intrinsics::ctlz(self as $ActualT) as u32 }
             }
         }
 
@@ -2293,10 +2299,13 @@ Basic usage:
 assert_eq!(n.trailing_zeros(), 3);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn trailing_zeros(self) -> u32 {
+                #[cfg(stage0)]
                 unsafe { intrinsics::cttz(self) as u32 }
+                #[cfg(not(stage0))]
+                { intrinsics::cttz(self) as u32 }
             }
         }
 
@@ -2370,10 +2379,13 @@ let m = n.swap_bytes();
 assert_eq!(m, ", $swapped, ");
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn swap_bytes(self) -> Self {
+                #[cfg(stage0)]
                 unsafe { intrinsics::bswap(self as $ActualT) as Self }
+                #[cfg(not(stage0))]
+                { intrinsics::bswap(self as $ActualT) as Self }
             }
         }
 
@@ -2393,10 +2405,13 @@ let m = n.reverse_bits();
 assert_eq!(m, ", $reversed, ");
 ```"),
             #[unstable(feature = "reverse_bits", issue = "48763")]
-            #[rustc_const_unstable(feature = "const_int_conversion")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_conversion"))]
             #[inline]
             pub const fn reverse_bits(self) -> Self {
+                #[cfg(stage0)]
                 unsafe { intrinsics::bitreverse(self as $ActualT) as Self }
+                #[cfg(not(stage0))]
+                { intrinsics::bitreverse(self as $ActualT) as Self }
             }
         }
 
@@ -2420,7 +2435,7 @@ if cfg!(target_endian = \"big\") {
 }", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn from_be(x: Self) -> Self {
                 #[cfg(target_endian = "big")]
@@ -2454,7 +2469,7 @@ if cfg!(target_endian = \"little\") {
 }", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn from_le(x: Self) -> Self {
                 #[cfg(target_endian = "little")]
@@ -2488,7 +2503,7 @@ if cfg!(target_endian = \"big\") {
 }", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn to_be(self) -> Self { // or not to be?
                 #[cfg(target_endian = "big")]
@@ -2522,7 +2537,7 @@ if cfg!(target_endian = \"little\") {
 }", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_const_unstable(feature = "const_int_ops")]
+            #[cfg_attr(stage0, rustc_const_unstable(feature = "const_int_ops"))]
             #[inline]
             pub const fn to_le(self) -> Self {
                 #[cfg(target_endian = "little")]
@@ -2957,8 +2972,8 @@ $EndFeature, "
             unsafe {
                 intrinsics::overflowing_mul(self, rhs)
             }
-                #[cfg(not(stage0))]
-                intrinsics::overflowing_mul(self, rhs)
+            #[cfg(not(stage0))]
+            intrinsics::overflowing_mul(self, rhs)
         }
 
         doc_comment! {
diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs
index 431accf6110ad..33f309c995702 100644
--- a/src/librustc_mir/transform/qualify_min_const_fn.rs
+++ b/src/librustc_mir/transform/qualify_min_const_fn.rs
@@ -404,6 +404,11 @@ fn is_intrinsic_whitelisted(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool
         | "unchecked_shr" // ~> .wrapping_shr
         | "rotate_left" // ~> .rotate_left
         | "rotate_right" // ~> .rotate_right
+        | "ctpop" // ~> .count_ones
+        | "ctlz" // ~> .leading_zeros
+        | "cttz" // ~> .trailing_zeros
+        | "bswap" // ~> .swap_bytes
+        | "bitreverse" // ~> .reverse_bits
         => true,
         _ => false,
     }
diff --git a/src/librustc_typeck/check/intrinsic.rs b/src/librustc_typeck/check/intrinsic.rs
index f2d69eb7f7456..dffe215b02ade 100644
--- a/src/librustc_typeck/check/intrinsic.rs
+++ b/src/librustc_typeck/check/intrinsic.rs
@@ -71,7 +71,8 @@ pub fn intrisic_operation_unsafety(intrinsic: &str) -> hir::Unsafety {
     match intrinsic {
         "size_of" | "min_align_of" | "needs_drop" |
         "overflowing_add" | "overflowing_sub" | "overflowing_mul" |
-        "rotate_left" | "rotate_right"
+        "rotate_left" | "rotate_right" |
+        "ctpop" | "ctlz" | "cttz" | "bswap" | "bitreverse"
         => hir::Unsafety::Normal,
         _ => hir::Unsafety::Unsafe,
     }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 6ded43dfed1f4..82cee70232aa7 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -242,7 +242,7 @@
 #![feature(char_error_internals)]
 #![feature(compiler_builtins_lib)]
 #![feature(concat_idents)]
-#![feature(const_int_ops)]
+#![cfg_attr(stage0, feature(const_int_ops))]
 #![feature(const_ip)]
 #![feature(const_raw_ptr_deref)]
 #![feature(const_cstr_unchecked)]
diff --git a/src/test/run-pass/const-int-conversion.rs b/src/test/run-pass/const-int-conversion.rs
index 2b4904cc6c39a..19d65860179b2 100644
--- a/src/test/run-pass/const-int-conversion.rs
+++ b/src/test/run-pass/const-int-conversion.rs
@@ -1,4 +1,4 @@
-#![feature(const_int_conversion, const_int_ops, reverse_bits)]
+#![feature(const_int_conversion, reverse_bits)]
 
 const REVERSE: u32 = 0x12345678_u32.reverse_bits();
 const FROM_BE_BYTES: i32 = i32::from_be_bytes([0x12, 0x34, 0x56, 0x78]);
@@ -21,4 +21,3 @@ fn main() {
     assert_eq!(TO_LE_BYTES, ident([0x78, 0x56, 0x34, 0x12]));
     assert_eq!(TO_NE_BYTES, ident([0x80, 0, 0, 0]));
 }
-
diff --git a/src/test/run-pass/consts/const-endianess.rs b/src/test/run-pass/consts/const-endianess.rs
index dfc6678ba289d..cbe6d864c9c3a 100644
--- a/src/test/run-pass/consts/const-endianess.rs
+++ b/src/test/run-pass/consts/const-endianess.rs
@@ -1,5 +1,4 @@
 // run-pass
-#![feature(const_int_ops)]
 #![feature(test)]
 
 extern crate test;
@@ -8,7 +7,6 @@ use test::black_box as b;
 const BE_U32: u32 = 55u32.to_be();
 const LE_U32: u32 = 55u32.to_le();
 
-
 fn main() {
     assert_eq!(BE_U32, b(55u32).to_be());
     assert_eq!(LE_U32, b(55u32).to_le());
diff --git a/src/test/run-pass/ctfe/bswap-const.rs b/src/test/run-pass/ctfe/bswap-const.rs
index 90e97c8edbdd5..3145c21acc988 100644
--- a/src/test/run-pass/ctfe/bswap-const.rs
+++ b/src/test/run-pass/ctfe/bswap-const.rs
@@ -4,9 +4,9 @@
 
 use std::intrinsics;
 
-const SWAPPED_U8: u8 = unsafe { intrinsics::bswap(0x12_u8) };
-const SWAPPED_U16: u16 = unsafe { intrinsics::bswap(0x12_34_u16) };
-const SWAPPED_I32: i32 = unsafe { intrinsics::bswap(0x12_34_56_78_i32) };
+const SWAPPED_U8: u8 = intrinsics::bswap(0x12_u8);
+const SWAPPED_U16: u16 = intrinsics::bswap(0x12_34_u16);
+const SWAPPED_I32: i32 = intrinsics::bswap(0x12_34_56_78_i32);
 
 fn main() {
     assert_eq!(SWAPPED_U8, 0x12);
diff --git a/src/test/run-pass/intrinsics/intrinsics-integer.rs b/src/test/run-pass/intrinsics/intrinsics-integer.rs
index 66e07f8683a87..0154f04995029 100644
--- a/src/test/run-pass/intrinsics/intrinsics-integer.rs
+++ b/src/test/run-pass/intrinsics/intrinsics-integer.rs
@@ -16,63 +16,63 @@ mod rusti {
 }
 
 pub fn main() {
-    unsafe {
-        use rusti::*;
-
-        assert_eq!(ctpop(0u8), 0); assert_eq!(ctpop(0i8), 0);
-        assert_eq!(ctpop(0u16), 0); assert_eq!(ctpop(0i16), 0);
-        assert_eq!(ctpop(0u32), 0); assert_eq!(ctpop(0i32), 0);
-        assert_eq!(ctpop(0u64), 0); assert_eq!(ctpop(0i64), 0);
-        assert_eq!(ctpop(0u128), 0); assert_eq!(ctpop(0i128), 0);
-
-        assert_eq!(ctpop(1u8), 1); assert_eq!(ctpop(1i8), 1);
-        assert_eq!(ctpop(1u16), 1); assert_eq!(ctpop(1i16), 1);
-        assert_eq!(ctpop(1u32), 1); assert_eq!(ctpop(1i32), 1);
-        assert_eq!(ctpop(1u64), 1); assert_eq!(ctpop(1i64), 1);
-        assert_eq!(ctpop(1u128), 1); assert_eq!(ctpop(1i128), 1);
-
-        assert_eq!(ctpop(10u8), 2); assert_eq!(ctpop(10i8), 2);
-        assert_eq!(ctpop(10u16), 2); assert_eq!(ctpop(10i16), 2);
-        assert_eq!(ctpop(10u32), 2); assert_eq!(ctpop(10i32), 2);
-        assert_eq!(ctpop(10u64), 2); assert_eq!(ctpop(10i64), 2);
-        assert_eq!(ctpop(10u128), 2); assert_eq!(ctpop(10i128), 2);
-
-        assert_eq!(ctpop(100u8), 3); assert_eq!(ctpop(100i8), 3);
-        assert_eq!(ctpop(100u16), 3); assert_eq!(ctpop(100i16), 3);
-        assert_eq!(ctpop(100u32), 3); assert_eq!(ctpop(100i32), 3);
-        assert_eq!(ctpop(100u64), 3); assert_eq!(ctpop(100i64), 3);
-        assert_eq!(ctpop(100u128), 3); assert_eq!(ctpop(100i128), 3);
-
-        assert_eq!(ctpop(-1i8 as u8), 8); assert_eq!(ctpop(-1i8), 8);
-        assert_eq!(ctpop(-1i16 as u16), 16); assert_eq!(ctpop(-1i16), 16);
-        assert_eq!(ctpop(-1i32 as u32), 32); assert_eq!(ctpop(-1i32), 32);
-        assert_eq!(ctpop(-1i64 as u64), 64); assert_eq!(ctpop(-1i64), 64);
-        assert_eq!(ctpop(-1i128 as u128), 128); assert_eq!(ctpop(-1i128), 128);
-
-        assert_eq!(ctlz(0u8), 8); assert_eq!(ctlz(0i8), 8);
-        assert_eq!(ctlz(0u16), 16); assert_eq!(ctlz(0i16), 16);
-        assert_eq!(ctlz(0u32), 32); assert_eq!(ctlz(0i32), 32);
-        assert_eq!(ctlz(0u64), 64); assert_eq!(ctlz(0i64), 64);
-        assert_eq!(ctlz(0u128), 128); assert_eq!(ctlz(0i128), 128);
-
-        assert_eq!(ctlz(1u8), 7); assert_eq!(ctlz(1i8), 7);
-        assert_eq!(ctlz(1u16), 15); assert_eq!(ctlz(1i16), 15);
-        assert_eq!(ctlz(1u32), 31); assert_eq!(ctlz(1i32), 31);
-        assert_eq!(ctlz(1u64), 63); assert_eq!(ctlz(1i64), 63);
-        assert_eq!(ctlz(1u128), 127); assert_eq!(ctlz(1i128), 127);
-
-        assert_eq!(ctlz(10u8), 4); assert_eq!(ctlz(10i8), 4);
-        assert_eq!(ctlz(10u16), 12); assert_eq!(ctlz(10i16), 12);
-        assert_eq!(ctlz(10u32), 28); assert_eq!(ctlz(10i32), 28);
-        assert_eq!(ctlz(10u64), 60); assert_eq!(ctlz(10i64), 60);
-        assert_eq!(ctlz(10u128), 124); assert_eq!(ctlz(10i128), 124);
-
-        assert_eq!(ctlz(100u8), 1); assert_eq!(ctlz(100i8), 1);
-        assert_eq!(ctlz(100u16), 9); assert_eq!(ctlz(100i16), 9);
-        assert_eq!(ctlz(100u32), 25); assert_eq!(ctlz(100i32), 25);
-        assert_eq!(ctlz(100u64), 57); assert_eq!(ctlz(100i64), 57);
-        assert_eq!(ctlz(100u128), 121); assert_eq!(ctlz(100i128), 121);
+    use rusti::*;
+
+    assert_eq!(ctpop(0u8), 0); assert_eq!(ctpop(0i8), 0);
+    assert_eq!(ctpop(0u16), 0); assert_eq!(ctpop(0i16), 0);
+    assert_eq!(ctpop(0u32), 0); assert_eq!(ctpop(0i32), 0);
+    assert_eq!(ctpop(0u64), 0); assert_eq!(ctpop(0i64), 0);
+    assert_eq!(ctpop(0u128), 0); assert_eq!(ctpop(0i128), 0);
+
+    assert_eq!(ctpop(1u8), 1); assert_eq!(ctpop(1i8), 1);
+    assert_eq!(ctpop(1u16), 1); assert_eq!(ctpop(1i16), 1);
+    assert_eq!(ctpop(1u32), 1); assert_eq!(ctpop(1i32), 1);
+    assert_eq!(ctpop(1u64), 1); assert_eq!(ctpop(1i64), 1);
+    assert_eq!(ctpop(1u128), 1); assert_eq!(ctpop(1i128), 1);
+
+    assert_eq!(ctpop(10u8), 2); assert_eq!(ctpop(10i8), 2);
+    assert_eq!(ctpop(10u16), 2); assert_eq!(ctpop(10i16), 2);
+    assert_eq!(ctpop(10u32), 2); assert_eq!(ctpop(10i32), 2);
+    assert_eq!(ctpop(10u64), 2); assert_eq!(ctpop(10i64), 2);
+    assert_eq!(ctpop(10u128), 2); assert_eq!(ctpop(10i128), 2);
+
+    assert_eq!(ctpop(100u8), 3); assert_eq!(ctpop(100i8), 3);
+    assert_eq!(ctpop(100u16), 3); assert_eq!(ctpop(100i16), 3);
+    assert_eq!(ctpop(100u32), 3); assert_eq!(ctpop(100i32), 3);
+    assert_eq!(ctpop(100u64), 3); assert_eq!(ctpop(100i64), 3);
+    assert_eq!(ctpop(100u128), 3); assert_eq!(ctpop(100i128), 3);
+
+    assert_eq!(ctpop(-1i8 as u8), 8); assert_eq!(ctpop(-1i8), 8);
+    assert_eq!(ctpop(-1i16 as u16), 16); assert_eq!(ctpop(-1i16), 16);
+    assert_eq!(ctpop(-1i32 as u32), 32); assert_eq!(ctpop(-1i32), 32);
+    assert_eq!(ctpop(-1i64 as u64), 64); assert_eq!(ctpop(-1i64), 64);
+    assert_eq!(ctpop(-1i128 as u128), 128); assert_eq!(ctpop(-1i128), 128);
+
+    assert_eq!(ctlz(0u8), 8); assert_eq!(ctlz(0i8), 8);
+    assert_eq!(ctlz(0u16), 16); assert_eq!(ctlz(0i16), 16);
+    assert_eq!(ctlz(0u32), 32); assert_eq!(ctlz(0i32), 32);
+    assert_eq!(ctlz(0u64), 64); assert_eq!(ctlz(0i64), 64);
+    assert_eq!(ctlz(0u128), 128); assert_eq!(ctlz(0i128), 128);
+
+    assert_eq!(ctlz(1u8), 7); assert_eq!(ctlz(1i8), 7);
+    assert_eq!(ctlz(1u16), 15); assert_eq!(ctlz(1i16), 15);
+    assert_eq!(ctlz(1u32), 31); assert_eq!(ctlz(1i32), 31);
+    assert_eq!(ctlz(1u64), 63); assert_eq!(ctlz(1i64), 63);
+    assert_eq!(ctlz(1u128), 127); assert_eq!(ctlz(1i128), 127);
+
+    assert_eq!(ctlz(10u8), 4); assert_eq!(ctlz(10i8), 4);
+    assert_eq!(ctlz(10u16), 12); assert_eq!(ctlz(10i16), 12);
+    assert_eq!(ctlz(10u32), 28); assert_eq!(ctlz(10i32), 28);
+    assert_eq!(ctlz(10u64), 60); assert_eq!(ctlz(10i64), 60);
+    assert_eq!(ctlz(10u128), 124); assert_eq!(ctlz(10i128), 124);
+
+    assert_eq!(ctlz(100u8), 1); assert_eq!(ctlz(100i8), 1);
+    assert_eq!(ctlz(100u16), 9); assert_eq!(ctlz(100i16), 9);
+    assert_eq!(ctlz(100u32), 25); assert_eq!(ctlz(100i32), 25);
+    assert_eq!(ctlz(100u64), 57); assert_eq!(ctlz(100i64), 57);
+    assert_eq!(ctlz(100u128), 121); assert_eq!(ctlz(100i128), 121);
 
+    unsafe {
         assert_eq!(ctlz_nonzero(1u8), 7); assert_eq!(ctlz_nonzero(1i8), 7);
         assert_eq!(ctlz_nonzero(1u16), 15); assert_eq!(ctlz_nonzero(1i16), 15);
         assert_eq!(ctlz_nonzero(1u32), 31); assert_eq!(ctlz_nonzero(1i32), 31);
@@ -90,37 +90,39 @@ pub fn main() {
         assert_eq!(ctlz_nonzero(100u32), 25); assert_eq!(ctlz_nonzero(100i32), 25);
         assert_eq!(ctlz_nonzero(100u64), 57); assert_eq!(ctlz_nonzero(100i64), 57);
         assert_eq!(ctlz_nonzero(100u128), 121); assert_eq!(ctlz_nonzero(100i128), 121);
+    }
 
-        assert_eq!(cttz(-1i8 as u8), 0); assert_eq!(cttz(-1i8), 0);
-        assert_eq!(cttz(-1i16 as u16), 0); assert_eq!(cttz(-1i16), 0);
-        assert_eq!(cttz(-1i32 as u32), 0); assert_eq!(cttz(-1i32), 0);
-        assert_eq!(cttz(-1i64 as u64), 0); assert_eq!(cttz(-1i64), 0);
-        assert_eq!(cttz(-1i128 as u128), 0); assert_eq!(cttz(-1i128), 0);
-
-        assert_eq!(cttz(0u8), 8); assert_eq!(cttz(0i8), 8);
-        assert_eq!(cttz(0u16), 16); assert_eq!(cttz(0i16), 16);
-        assert_eq!(cttz(0u32), 32); assert_eq!(cttz(0i32), 32);
-        assert_eq!(cttz(0u64), 64); assert_eq!(cttz(0i64), 64);
-        assert_eq!(cttz(0u128), 128); assert_eq!(cttz(0i128), 128);
-
-        assert_eq!(cttz(1u8), 0); assert_eq!(cttz(1i8), 0);
-        assert_eq!(cttz(1u16), 0); assert_eq!(cttz(1i16), 0);
-        assert_eq!(cttz(1u32), 0); assert_eq!(cttz(1i32), 0);
-        assert_eq!(cttz(1u64), 0); assert_eq!(cttz(1i64), 0);
-        assert_eq!(cttz(1u128), 0); assert_eq!(cttz(1i128), 0);
-
-        assert_eq!(cttz(10u8), 1); assert_eq!(cttz(10i8), 1);
-        assert_eq!(cttz(10u16), 1); assert_eq!(cttz(10i16), 1);
-        assert_eq!(cttz(10u32), 1); assert_eq!(cttz(10i32), 1);
-        assert_eq!(cttz(10u64), 1); assert_eq!(cttz(10i64), 1);
-        assert_eq!(cttz(10u128), 1); assert_eq!(cttz(10i128), 1);
-
-        assert_eq!(cttz(100u8), 2); assert_eq!(cttz(100i8), 2);
-        assert_eq!(cttz(100u16), 2); assert_eq!(cttz(100i16), 2);
-        assert_eq!(cttz(100u32), 2); assert_eq!(cttz(100i32), 2);
-        assert_eq!(cttz(100u64), 2); assert_eq!(cttz(100i64), 2);
-        assert_eq!(cttz(100u128), 2); assert_eq!(cttz(100i128), 2);
+    assert_eq!(cttz(-1i8 as u8), 0); assert_eq!(cttz(-1i8), 0);
+    assert_eq!(cttz(-1i16 as u16), 0); assert_eq!(cttz(-1i16), 0);
+    assert_eq!(cttz(-1i32 as u32), 0); assert_eq!(cttz(-1i32), 0);
+    assert_eq!(cttz(-1i64 as u64), 0); assert_eq!(cttz(-1i64), 0);
+    assert_eq!(cttz(-1i128 as u128), 0); assert_eq!(cttz(-1i128), 0);
+
+    assert_eq!(cttz(0u8), 8); assert_eq!(cttz(0i8), 8);
+    assert_eq!(cttz(0u16), 16); assert_eq!(cttz(0i16), 16);
+    assert_eq!(cttz(0u32), 32); assert_eq!(cttz(0i32), 32);
+    assert_eq!(cttz(0u64), 64); assert_eq!(cttz(0i64), 64);
+    assert_eq!(cttz(0u128), 128); assert_eq!(cttz(0i128), 128);
+
+    assert_eq!(cttz(1u8), 0); assert_eq!(cttz(1i8), 0);
+    assert_eq!(cttz(1u16), 0); assert_eq!(cttz(1i16), 0);
+    assert_eq!(cttz(1u32), 0); assert_eq!(cttz(1i32), 0);
+    assert_eq!(cttz(1u64), 0); assert_eq!(cttz(1i64), 0);
+    assert_eq!(cttz(1u128), 0); assert_eq!(cttz(1i128), 0);
+
+    assert_eq!(cttz(10u8), 1); assert_eq!(cttz(10i8), 1);
+    assert_eq!(cttz(10u16), 1); assert_eq!(cttz(10i16), 1);
+    assert_eq!(cttz(10u32), 1); assert_eq!(cttz(10i32), 1);
+    assert_eq!(cttz(10u64), 1); assert_eq!(cttz(10i64), 1);
+    assert_eq!(cttz(10u128), 1); assert_eq!(cttz(10i128), 1);
+
+    assert_eq!(cttz(100u8), 2); assert_eq!(cttz(100i8), 2);
+    assert_eq!(cttz(100u16), 2); assert_eq!(cttz(100i16), 2);
+    assert_eq!(cttz(100u32), 2); assert_eq!(cttz(100i32), 2);
+    assert_eq!(cttz(100u64), 2); assert_eq!(cttz(100i64), 2);
+    assert_eq!(cttz(100u128), 2); assert_eq!(cttz(100i128), 2);
 
+    unsafe {
         assert_eq!(cttz_nonzero(-1i8 as u8), 0); assert_eq!(cttz_nonzero(-1i8), 0);
         assert_eq!(cttz_nonzero(-1i16 as u16), 0); assert_eq!(cttz_nonzero(-1i16), 0);
         assert_eq!(cttz_nonzero(-1i32 as u32), 0); assert_eq!(cttz_nonzero(-1i32), 0);
@@ -144,27 +146,27 @@ pub fn main() {
         assert_eq!(cttz_nonzero(100u32), 2); assert_eq!(cttz_nonzero(100i32), 2);
         assert_eq!(cttz_nonzero(100u64), 2); assert_eq!(cttz_nonzero(100i64), 2);
         assert_eq!(cttz_nonzero(100u128), 2); assert_eq!(cttz_nonzero(100i128), 2);
-
-        assert_eq!(bswap(0x0Au8), 0x0A); // no-op
-        assert_eq!(bswap(0x0Ai8), 0x0A); // no-op
-        assert_eq!(bswap(0x0A0Bu16), 0x0B0A);
-        assert_eq!(bswap(0x0A0Bi16), 0x0B0A);
-        assert_eq!(bswap(0x0ABBCC0Du32), 0x0DCCBB0A);
-        assert_eq!(bswap(0x0ABBCC0Di32), 0x0DCCBB0A);
-        assert_eq!(bswap(0x0122334455667708u64), 0x0877665544332201);
-        assert_eq!(bswap(0x0122334455667708i64), 0x0877665544332201);
-        assert_eq!(bswap(0x0122334455667708u128), 0x08776655443322010000000000000000);
-        assert_eq!(bswap(0x0122334455667708i128), 0x08776655443322010000000000000000);
-
-        assert_eq!(bitreverse(0x0Au8), 0x50);
-        assert_eq!(bitreverse(0x0Ai8), 0x50);
-        assert_eq!(bitreverse(0x0A0Cu16), 0x3050);
-        assert_eq!(bitreverse(0x0A0Ci16), 0x3050);
-        assert_eq!(bitreverse(0x0ABBCC0Eu32), 0x7033DD50);
-        assert_eq!(bitreverse(0x0ABBCC0Ei32), 0x7033DD50);
-        assert_eq!(bitreverse(0x0122334455667708u64), 0x10EE66AA22CC4480);
-        assert_eq!(bitreverse(0x0122334455667708i64), 0x10EE66AA22CC4480);
-        assert_eq!(bitreverse(0x0122334455667708u128), 0x10EE66AA22CC44800000000000000000);
-        assert_eq!(bitreverse(0x0122334455667708i128), 0x10EE66AA22CC44800000000000000000);
     }
+
+    assert_eq!(bswap(0x0Au8), 0x0A); // no-op
+    assert_eq!(bswap(0x0Ai8), 0x0A); // no-op
+    assert_eq!(bswap(0x0A0Bu16), 0x0B0A);
+    assert_eq!(bswap(0x0A0Bi16), 0x0B0A);
+    assert_eq!(bswap(0x0ABBCC0Du32), 0x0DCCBB0A);
+    assert_eq!(bswap(0x0ABBCC0Di32), 0x0DCCBB0A);
+    assert_eq!(bswap(0x0122334455667708u64), 0x0877665544332201);
+    assert_eq!(bswap(0x0122334455667708i64), 0x0877665544332201);
+    assert_eq!(bswap(0x0122334455667708u128), 0x08776655443322010000000000000000);
+    assert_eq!(bswap(0x0122334455667708i128), 0x08776655443322010000000000000000);
+
+    assert_eq!(bitreverse(0x0Au8), 0x50);
+    assert_eq!(bitreverse(0x0Ai8), 0x50);
+    assert_eq!(bitreverse(0x0A0Cu16), 0x3050);
+    assert_eq!(bitreverse(0x0A0Ci16), 0x3050);
+    assert_eq!(bitreverse(0x0ABBCC0Eu32), 0x7033DD50);
+    assert_eq!(bitreverse(0x0ABBCC0Ei32), 0x7033DD50);
+    assert_eq!(bitreverse(0x0122334455667708u64), 0x10EE66AA22CC4480);
+    assert_eq!(bitreverse(0x0122334455667708i64), 0x10EE66AA22CC4480);
+    assert_eq!(bitreverse(0x0122334455667708u128), 0x10EE66AA22CC44800000000000000000);
+    assert_eq!(bitreverse(0x0122334455667708i128), 0x10EE66AA22CC44800000000000000000);
 }
diff --git a/src/test/ui/bad/bad-intrinsic-monomorphization.rs b/src/test/ui/bad/bad-intrinsic-monomorphization.rs
index b56e1ea039cf1..a29723f34b432 100644
--- a/src/test/ui/bad/bad-intrinsic-monomorphization.rs
+++ b/src/test/ui/bad/bad-intrinsic-monomorphization.rs
@@ -14,7 +14,7 @@ use std::intrinsics;
 #[derive(Copy, Clone)]
 pub struct Foo(i64);
 
-pub unsafe fn test_cttz(v: Foo) -> Foo {
+pub fn test_cttz(v: Foo) -> Foo {
     intrinsics::cttz(v)
     //~^ ERROR `cttz` intrinsic: expected basic integer type, found `Foo`
 }