Fix change of behaviour found by @dotdash

src/librustc_trans/abi.rs

@@ -1056,16 +1056,16 @@ impl<'a, 'tcx> FnType<'tcx> {
             _ => {}
         }
         if let layout::Abi::Scalar(ref scalar) = self.ret.layout.abi {
-            if let Some(range) = scalar.range_metadata(bx.cx) {
-                // If the value is a boolean, the range is 0..2 and that ultimately
-                // become 0..0 when the type becomes i1, which would be rejected
-                // by the LLVM verifier.
-                match scalar.value {
-                    layout::Int(..) if !scalar.is_bool() => {
+            // If the value is a boolean, the range is 0..2 and that ultimately
+            // become 0..0 when the type becomes i1, which would be rejected
+            // by the LLVM verifier.
+            match scalar.value {
+                layout::Int(..) if !scalar.is_bool() => {
+                    if let Some(range) = scalar.range_metadata(bx.cx) {
                         bx.range_metadata(callsite, range);
                     }
-                    _ => {}
                 }
+                _ => {}
             }
         }
         for arg in &self.args {

src/librustc_trans/lib.rs

@@ -25,6 +25,7 @@
 #![allow(unused_attributes)]
 #![feature(libc)]
 #![feature(quote)]
+#![feature(range_contains)]
 #![feature(rustc_diagnostic_macros)]
 #![feature(slice_sort_by_cached_key)]
 #![feature(optin_builtin_traits)]

src/librustc_trans/mir/place.rs

@@ -91,16 +91,17 @@ impl<'a, 'tcx> PlaceRef<'tcx> {
         }
 
         let scalar_load_metadata = |load, scalar: &layout::Scalar| {
-            if let Some(range) = scalar.range_metadata(bx.cx) {
-                match scalar.value {
-                    layout::Int(..) => {
+            match scalar.value {
+                layout::Int(..) => {
+                    if let Some(range) = scalar.range_metadata(bx.cx) {
                         bx.range_metadata(load, range);
                     }
-                    layout::Pointer if 0 < range.start && range.start < range.end => {
-                        bx.nonnull_metadata(load);
-                    }
-                    _ => {}
                 }
+                layout::Pointer
+                if (1..scalar.valid_range.end).contains(&scalar.valid_range.start) => {
+                    bx.nonnull_metadata(load);
+                }
+                _ => {}
             }
         };