Rollup merge of #124251 - scottmcm:unop-ptr-metadata, r=oli-obk
Add an intrinsic for `ptr::metadata` The follow-up to #123840, so we can remove `PtrComponents` and `PtrRepr` from libcore entirely (well, after a bootstrap update). As discussed in <https://rust-lang.zulipchat.com/#narrow/stream/189540-t-compiler.2Fwg-mir-opt/topic/.60ptr_metadata.60.20in.20MIR/near/435637808>, this introduces `UnOp::PtrMetadata` taking a raw pointer and returning the associated metadata value. By no longer going through a `union`, this should also help future PRs better optimize pointer operations. r? ``@oli-obk``
This commit is contained in:
commit
2d3b1e014b
42 changed files with 600 additions and 53 deletions
|
|
@ -0,0 +1,22 @@
|
|||
//@compile-flags: -Zmiri-disable-validation
|
||||
#![feature(core_intrinsics, custom_mir)]
|
||||
use std::intrinsics::mir::*;
|
||||
|
||||
// This disables validation and uses custom MIR hit exactly the UB in the intrinsic,
|
||||
// rather than getting UB from the typed load or parameter passing.
|
||||
|
||||
#[custom_mir(dialect = "runtime")]
|
||||
pub unsafe fn deref_meta(p: *const *const [i32]) -> usize {
|
||||
mir!({
|
||||
RET = PtrMetadata(*p); //~ ERROR: Undefined Behavior: using uninitialized data
|
||||
Return()
|
||||
})
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let mut p = std::mem::MaybeUninit::<*const [i32]>::uninit();
|
||||
unsafe {
|
||||
(*p.as_mut_ptr().cast::<[usize; 2]>())[1] = 4;
|
||||
let _meta = deref_meta(p.as_ptr().cast());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
|
||||
--> $DIR/ptr_metadata_uninit_slice_data.rs:LL:CC
|
||||
|
|
||||
LL | RET = PtrMetadata(*p);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
|
||||
|
|
||||
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
|
||||
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
|
||||
= note: BACKTRACE:
|
||||
= note: inside `deref_meta` at $DIR/ptr_metadata_uninit_slice_data.rs:LL:CC
|
||||
note: inside `main`
|
||||
--> $DIR/ptr_metadata_uninit_slice_data.rs:LL:CC
|
||||
|
|
||||
LL | let _meta = deref_meta(p.as_ptr().cast());
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
//@compile-flags: -Zmiri-disable-validation
|
||||
#![feature(core_intrinsics, custom_mir)]
|
||||
use std::intrinsics::mir::*;
|
||||
|
||||
// This disables validation and uses custom MIR hit exactly the UB in the intrinsic,
|
||||
// rather than getting UB from the typed load or parameter passing.
|
||||
|
||||
#[custom_mir(dialect = "runtime")]
|
||||
pub unsafe fn deref_meta(p: *const *const [i32]) -> usize {
|
||||
mir!({
|
||||
RET = PtrMetadata(*p); //~ ERROR: Undefined Behavior: using uninitialized data
|
||||
Return()
|
||||
})
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let mut p = std::mem::MaybeUninit::<*const [i32]>::uninit();
|
||||
unsafe {
|
||||
(*p.as_mut_ptr().cast::<[*const i32; 2]>())[0] = 4 as *const i32;
|
||||
let _meta = deref_meta(p.as_ptr().cast());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
warning: integer-to-pointer cast
|
||||
--> $DIR/ptr_metadata_uninit_slice_len.rs:LL:CC
|
||||
|
|
||||
LL | (*p.as_mut_ptr().cast::<[*const i32; 2]>())[0] = 4 as *const i32;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ integer-to-pointer cast
|
||||
|
|
||||
= help: This program is using integer-to-pointer casts or (equivalently) `ptr::with_exposed_provenance`,
|
||||
= help: which means that Miri might miss pointer bugs in this program.
|
||||
= help: See https://doc.rust-lang.org/nightly/std/ptr/fn.with_exposed_provenance.html for more details on that operation.
|
||||
= help: To ensure that Miri does not miss bugs in your program, use Strict Provenance APIs (https://doc.rust-lang.org/nightly/std/ptr/index.html#strict-provenance, https://crates.io/crates/sptr) instead.
|
||||
= help: You can then pass the `-Zmiri-strict-provenance` flag to Miri, to ensure you are not relying on `with_exposed_provenance` semantics.
|
||||
= help: Alternatively, the `-Zmiri-permissive-provenance` flag disables this warning.
|
||||
= note: BACKTRACE:
|
||||
= note: inside `main` at $DIR/ptr_metadata_uninit_slice_len.rs:LL:CC
|
||||
|
||||
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
|
||||
--> $DIR/ptr_metadata_uninit_slice_len.rs:LL:CC
|
||||
|
|
||||
LL | RET = PtrMetadata(*p);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
|
||||
|
|
||||
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
|
||||
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
|
||||
= note: BACKTRACE:
|
||||
= note: inside `deref_meta` at $DIR/ptr_metadata_uninit_slice_len.rs:LL:CC
|
||||
note: inside `main`
|
||||
--> $DIR/ptr_metadata_uninit_slice_len.rs:LL:CC
|
||||
|
|
||||
LL | let _meta = deref_meta(p.as_ptr().cast());
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
|
||||
|
||||
error: aborting due to 1 previous error; 1 warning emitted
|
||||
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
//@compile-flags: -Zmiri-disable-validation
|
||||
#![feature(core_intrinsics, custom_mir)]
|
||||
use std::intrinsics::mir::*;
|
||||
|
||||
// This disables validation and uses custom MIR hit exactly the UB in the intrinsic,
|
||||
// rather than getting UB from the typed load or parameter passing.
|
||||
|
||||
#[custom_mir(dialect = "runtime")]
|
||||
pub unsafe fn deref_meta(p: *const *const i32) -> () {
|
||||
mir!({
|
||||
RET = PtrMetadata(*p); //~ ERROR: Undefined Behavior: using uninitialized data
|
||||
Return()
|
||||
})
|
||||
}
|
||||
|
||||
fn main() {
|
||||
// Even though the meta is the trivially-valid `()`, this is still UB
|
||||
|
||||
let p = std::mem::MaybeUninit::<*const i32>::uninit();
|
||||
unsafe {
|
||||
let _meta = deref_meta(p.as_ptr());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
|
||||
--> $DIR/ptr_metadata_uninit_thin.rs:LL:CC
|
||||
|
|
||||
LL | RET = PtrMetadata(*p);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
|
||||
|
|
||||
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
|
||||
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
|
||||
= note: BACKTRACE:
|
||||
= note: inside `deref_meta` at $DIR/ptr_metadata_uninit_thin.rs:LL:CC
|
||||
note: inside `main`
|
||||
--> $DIR/ptr_metadata_uninit_thin.rs:LL:CC
|
||||
|
|
||||
LL | let _meta = deref_meta(p.as_ptr());
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//@compile-flags: -Zmiri-permissive-provenance
|
||||
#![feature(core_intrinsics, layout_for_ptr)]
|
||||
#![feature(core_intrinsics, layout_for_ptr, ptr_metadata)]
|
||||
//! Tests for various intrinsics that do not fit anywhere else.
|
||||
|
||||
use std::intrinsics;
|
||||
|
|
@ -57,4 +57,10 @@ fn main() {
|
|||
// Make sure that even if the discriminant is stored together with data, the intrinsic returns
|
||||
// only the discriminant, nothing about the data.
|
||||
assert_eq!(discriminant(&Some(false)), discriminant(&Some(true)));
|
||||
|
||||
let () = intrinsics::ptr_metadata(&[1, 2, 3]);
|
||||
let len = intrinsics::ptr_metadata(&[1, 2, 3][..]);
|
||||
assert_eq!(len, 3);
|
||||
let dyn_meta = intrinsics::ptr_metadata(&[1, 2, 3] as &dyn std::fmt::Debug);
|
||||
assert_eq!(dyn_meta.size_of(), 12);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue