Auto merge of #1712 - RalfJung:rustup, r=RalfJung

Rustup

Fixes #1706
Cc #1711 for the temporarily disabled tests

Author: bors

rust-version

@@ -1 +1 @@
-bb587b1a1737738658d2eaecd4c8c1cab555257a
+42a4673fbd40b09a99d057eaa9b3e5579b54c184

tests/compile-fail/branchless-select-i128-pointer.rs

@@ -0,0 +1,20 @@
+use std::mem::transmute;
+
+#[cfg(target_pointer_width = "32")]
+type TwoPtrs = i64;
+#[cfg(target_pointer_width = "64")]
+type TwoPtrs = i128;
+
+fn main() {
+    for &my_bool in &[true, false] {
+        let mask = -(my_bool as TwoPtrs); // false -> 0, true -> -1 aka !0
+        // This is branchless code to select one or the other pointer.
+        // For now, Miri brafs on it, but if this code ever passes we better make sure it behaves correctly.
+        let val = unsafe {
+            transmute::<_, &str>(
+                !mask & transmute::<_, TwoPtrs>("false !") | mask & transmute::<_, TwoPtrs>("true !"), //~ERROR encountered (potentially part of) a pointer, but expected plain (non-pointer) bytes
+            )
+        };
+        println!("{}", val);
+    }
+}

tests/compile-fail/validity/execute_memory.rs

@@ -1,3 +1,4 @@
+// ignore-test FIXME (Miri issue #1711)
 #![feature(box_syntax)]
 
 fn main() {

tests/compile-fail/validity/invalid_fnptr_uninit.rs

@@ -1,3 +1,4 @@
+// ignore-test FIXME (Miri issue #1711)
 #![allow(invalid_value)]
 
 union MyUninit {