From e70473d9442d17de7f7d38d3d7e8606226d1c4fa Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 14 Aug 2022 07:51:45 -0400 Subject: [PATCH] rustup --- rust-version | 2 +- tests/fail/provenance/strict_provenance_cast.rs | 3 ++- tests/fail/provenance/strict_provenance_cast.stderr | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rust-version b/rust-version index fdd18704d1..aaf664f44e 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -75b7e52e92c3b00fc891b47f5b2efdff0a2be55a +2fbc08e2ce64dee45a29cb6133da6b32366268aa diff --git a/tests/fail/provenance/strict_provenance_cast.rs b/tests/fail/provenance/strict_provenance_cast.rs index 0016e78792..04552d0c33 100644 --- a/tests/fail/provenance/strict_provenance_cast.rs +++ b/tests/fail/provenance/strict_provenance_cast.rs @@ -1,6 +1,7 @@ //@compile-flags: -Zmiri-strict-provenance +#![feature(strict_provenance)] fn main() { let addr = &0 as *const i32 as usize; - let _ptr = addr as *const i32; //~ ERROR: integer-to-pointer casts and `ptr::from_exposed_addr` are not supported + let _ptr = std::ptr::from_exposed_addr::(addr); //~ ERROR: integer-to-pointer casts and `ptr::from_exposed_addr` are not supported } diff --git a/tests/fail/provenance/strict_provenance_cast.stderr b/tests/fail/provenance/strict_provenance_cast.stderr index ff6ab1c9e9..5796a3196d 100644 --- a/tests/fail/provenance/strict_provenance_cast.stderr +++ b/tests/fail/provenance/strict_provenance_cast.stderr @@ -1,8 +1,8 @@ error: unsupported operation: integer-to-pointer casts and `ptr::from_exposed_addr` are not supported with `-Zmiri-strict-provenance` --> $DIR/strict_provenance_cast.rs:LL:CC | -LL | let _ptr = addr as *const i32; - | ^^^^^^^^^^^^^^^^^^ integer-to-pointer casts and `ptr::from_exposed_addr` are not supported with `-Zmiri-strict-provenance` +LL | let _ptr = std::ptr::from_exposed_addr::(addr); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ integer-to-pointer casts and `ptr::from_exposed_addr` are not supported with `-Zmiri-strict-provenance` | = help: use Strict Provenance APIs (https://doc.rust-lang.org/nightly/std/ptr/index.html#strict-provenance, https://crates.io/crates/sptr) instead = note: backtrace: