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

Rustup

Includes #1626 and #1629.

Author: bors

rust-version

@@ -1 +1 @@
-12f0dba618e761c987142474435dff95ab177f3c
+bf469eb6c20ccea05400a1942c70343f36705e1c

src/shims/posix/linux/dlsym.rs

@@ -12,6 +12,8 @@ impl Dlsym {
     pub fn from_str(name: &str) -> InterpResult<'static, Option<Dlsym>> {
         Ok(match &*name {
             "__pthread_get_minstack" => None,
+            "getrandom" => None, // std falls back to syscall(SYS_getrandom, ...) when this is NULL.
+            "statx" => None, // std falls back to syscall(SYS_statx, ...) when this is NULL.
             _ => throw_unsup_format!("unsupported Linux dlsym: {}", name),
         })
     }

src/shims/posix/linux/foreign_items.rs

@@ -208,7 +208,9 @@ fn getrandom<'tcx>(
 
     // The only supported flags are GRND_RANDOM and GRND_NONBLOCK,
     // neither of which have any effect on our current PRNG.
-    this.read_scalar(flags)?.to_i32()?;
+    let _flags = this.read_scalar(flags)?;
+    // FIXME: Check that this is an integer type of the right size.
+    // Currently, some callers pass i32 and some usize, is that even allowed?
 
     this.gen_random(ptr, len)?;
     this.write_scalar(Scalar::from_machine_usize(len, this), dest)?;

tests/run-pass/backtrace-std.rs

@@ -1,5 +1,5 @@
 // normalize-stderr-test "at .*/(rust[^/]*|checkout)/library/" -> "at RUSTLIB/"
-// normalize-stderr-test "RUSTLIB/(.*):\d+"-> "RUSTLIB/$1:LL"
+// normalize-stderr-test "RUSTLIB/([^:]*):\d+:\d+"-> "RUSTLIB/$1:LL:CC"
 // normalize-stderr-test "::<.*>" -> ""
 // compile-flags: -Zmiri-disable-isolation
 

tests/run-pass/backtrace-std.stderr

@@ -1,28 +1,28 @@
    0: func_d
-             at $DIR/backtrace-std.rs:18
+             at $DIR/backtrace-std.rs:18:45
    1: func_c
-             at $DIR/backtrace-std.rs:17
+             at $DIR/backtrace-std.rs:17:45
    2: func_b
-             at $DIR/backtrace-std.rs:11
+             at $DIR/backtrace-std.rs:11:48
    3: func_a
-             at $DIR/backtrace-std.rs:10
+             at $DIR/backtrace-std.rs:10:45
    4: main
-             at $DIR/backtrace-std.rs:21
+             at $DIR/backtrace-std.rs:21:19
    5: <fn() as std::ops::FnOnce<()>>::call_once - shim(fn())
-             at RUSTLIB/core/src/ops/function.rs:LL
+             at RUSTLIB/core/src/ops/function.rs:LL:CC
    6: std::sys_common::backtrace::__rust_begin_short_backtrace
-             at RUSTLIB/std/src/sys_common/backtrace.rs:LL
+             at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
    7: std::rt::lang_start::{closure#0}
-             at RUSTLIB/std/src/rt.rs:LL
+             at RUSTLIB/std/src/rt.rs:LL:CC
    8: std::ops::function::impls::call_once
-             at RUSTLIB/core/src/ops/function.rs:LL
+             at RUSTLIB/core/src/ops/function.rs:LL:CC
    9: std::panicking::r#try::do_call
-             at RUSTLIB/std/src/panicking.rs:LL
+             at RUSTLIB/std/src/panicking.rs:LL:CC
   10: std::panicking::r#try
-             at RUSTLIB/std/src/panicking.rs:LL
+             at RUSTLIB/std/src/panicking.rs:LL:CC
   11: std::panic::catch_unwind
-             at RUSTLIB/std/src/panic.rs:LL
+             at RUSTLIB/std/src/panic.rs:LL:CC
   12: std::rt::lang_start_internal
-             at RUSTLIB/std/src/rt.rs:LL
+             at RUSTLIB/std/src/rt.rs:LL:CC
   13: std::rt::lang_start
-             at RUSTLIB/std/src/rt.rs:LL
+             at RUSTLIB/std/src/rt.rs:LL:CC