forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#86295 - usbalbin:revert_revert_of_constness, …
…r=RalfJung Revert revert of constness in rust-lang#86003 Re-constify `mem::swap`, `mem::replace`, `ptr::write` which were marked as not `const` in rust-lang#86003 Once the checks pass, this should solve rust-lang#86236
- Loading branch information
Showing
10 changed files
with
231 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// error-pattern: evaluation of constant value failed | ||
|
||
#![feature(const_ptr_read)] | ||
#![feature(const_ptr_offset)] | ||
|
||
fn main() { | ||
use std::ptr; | ||
|
||
const DATA: [u32; 1] = [42]; | ||
|
||
const PAST_END_PTR: *const u32 = unsafe { DATA.as_ptr().add(1) }; | ||
|
||
const _READ: u32 = unsafe { ptr::read(PAST_END_PTR) }; | ||
const _CONST_READ: u32 = unsafe { PAST_END_PTR.read() }; | ||
const _MUT_READ: u32 = unsafe { (PAST_END_PTR as *mut u32).read() }; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
error[E0080]: evaluation of constant value failed | ||
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL | ||
| | ||
LL | unsafe { copy_nonoverlapping(src, dst, count) } | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | | ||
| memory access failed: pointer must be in-bounds at offset 8, but is outside bounds of alloc6 which has size 4 | ||
| inside `copy_nonoverlapping::<u32>` at $SRC_DIR/core/src/intrinsics.rs:LL:COL | ||
| | ||
::: $SRC_DIR/core/src/ptr/mod.rs:LL:COL | ||
| | ||
LL | copy_nonoverlapping(src, tmp.as_mut_ptr(), 1); | ||
| --------------------------------------------- inside `std::ptr::read::<u32>` at $SRC_DIR/core/src/ptr/mod.rs:LL:COL | ||
| | ||
::: $DIR/out_of_bounds_read.rs:13:33 | ||
| | ||
LL | const _READ: u32 = unsafe { ptr::read(PAST_END_PTR) }; | ||
| ----------------------- inside `_READ` at $DIR/out_of_bounds_read.rs:13:33 | ||
|
||
error[E0080]: evaluation of constant value failed | ||
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL | ||
| | ||
LL | unsafe { copy_nonoverlapping(src, dst, count) } | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | | ||
| memory access failed: pointer must be in-bounds at offset 8, but is outside bounds of alloc6 which has size 4 | ||
| inside `copy_nonoverlapping::<u32>` at $SRC_DIR/core/src/intrinsics.rs:LL:COL | ||
| | ||
::: $SRC_DIR/core/src/ptr/mod.rs:LL:COL | ||
| | ||
LL | copy_nonoverlapping(src, tmp.as_mut_ptr(), 1); | ||
| --------------------------------------------- inside `std::ptr::read::<u32>` at $SRC_DIR/core/src/ptr/mod.rs:LL:COL | ||
| | ||
::: $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL | ||
| | ||
LL | unsafe { read(self) } | ||
| ---------- inside `ptr::const_ptr::<impl *const u32>::read` at $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL | ||
| | ||
::: $DIR/out_of_bounds_read.rs:14:39 | ||
| | ||
LL | const _CONST_READ: u32 = unsafe { PAST_END_PTR.read() }; | ||
| ------------------- inside `_CONST_READ` at $DIR/out_of_bounds_read.rs:14:39 | ||
|
||
error[E0080]: evaluation of constant value failed | ||
--> $SRC_DIR/core/src/intrinsics.rs:LL:COL | ||
| | ||
LL | unsafe { copy_nonoverlapping(src, dst, count) } | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | | ||
| memory access failed: pointer must be in-bounds at offset 8, but is outside bounds of alloc6 which has size 4 | ||
| inside `copy_nonoverlapping::<u32>` at $SRC_DIR/core/src/intrinsics.rs:LL:COL | ||
| | ||
::: $SRC_DIR/core/src/ptr/mod.rs:LL:COL | ||
| | ||
LL | copy_nonoverlapping(src, tmp.as_mut_ptr(), 1); | ||
| --------------------------------------------- inside `std::ptr::read::<u32>` at $SRC_DIR/core/src/ptr/mod.rs:LL:COL | ||
| | ||
::: $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL | ||
| | ||
LL | unsafe { read(self) } | ||
| ---------- inside `ptr::mut_ptr::<impl *mut u32>::read` at $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL | ||
| | ||
::: $DIR/out_of_bounds_read.rs:15:37 | ||
| | ||
LL | const _MUT_READ: u32 = unsafe { (PAST_END_PTR as *mut u32).read() }; | ||
| --------------------------------- inside `_MUT_READ` at $DIR/out_of_bounds_read.rs:15:37 | ||
|
||
error: aborting due to 3 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0080`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
#![stable(feature = "dummy", since = "1.0.0")] | ||
|
||
// ignore-tidy-linelength | ||
#![feature(intrinsics, staged_api)] | ||
#![feature(const_mut_refs, const_intrinsic_copy, const_ptr_offset)] | ||
use std::mem; | ||
|
||
extern "rust-intrinsic" { | ||
#[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")] | ||
fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize); | ||
|
||
#[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")] | ||
fn copy<T>(src: *const T, dst: *mut T, count: usize); | ||
} | ||
|
||
const COPY_ZERO: () = unsafe { | ||
// Since we are not copying anything, this should be allowed. | ||
let src = (); | ||
let mut dst = (); | ||
copy_nonoverlapping(&src as *const _ as *const i32, &mut dst as *mut _ as *mut i32, 0); | ||
}; | ||
|
||
const COPY_OOB_1: () = unsafe { | ||
let mut x = 0i32; | ||
let dangle = (&mut x as *mut i32).wrapping_add(10); | ||
// Even if the first ptr is an int ptr and this is a ZST copy, we should detect dangling 2nd ptrs. | ||
copy_nonoverlapping(0x100 as *const i32, dangle, 0); //~ evaluation of constant value failed [E0080] | ||
}; | ||
const COPY_OOB_2: () = unsafe { | ||
let x = 0i32; | ||
let dangle = (&x as *const i32).wrapping_add(10); | ||
// Even if the second ptr is an int ptr and this is a ZST copy, we should detect dangling 1st ptrs. | ||
copy_nonoverlapping(dangle, 0x100 as *mut i32, 0); //~ evaluation of constant value failed [E0080] | ||
//~| memory access failed: pointer must be in-bounds | ||
}; | ||
|
||
const COPY_SIZE_OVERFLOW: () = unsafe { | ||
let x = 0; | ||
let mut y = 0; | ||
copy(&x, &mut y, 1usize << (mem::size_of::<usize>() * 8 - 1)); //~ evaluation of constant value failed [E0080] | ||
//~| overflow computing total size of `copy` | ||
}; | ||
const COPY_NONOVERLAPPING_SIZE_OVERFLOW: () = unsafe { | ||
let x = 0; | ||
let mut y = 0; | ||
copy_nonoverlapping(&x, &mut y, 1usize << (mem::size_of::<usize>() * 8 - 1)); //~ evaluation of constant value failed [E0080] | ||
//~| overflow computing total size of `copy_nonoverlapping` | ||
}; | ||
|
||
fn main() { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
error[E0080]: evaluation of constant value failed | ||
--> $DIR/copy-intrinsic.rs:27:5 | ||
| | ||
LL | copy_nonoverlapping(0x100 as *const i32, dangle, 0); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access failed: pointer must be in-bounds at offset 40, but is outside bounds of alloc4 which has size 4 | ||
|
||
error[E0080]: evaluation of constant value failed | ||
--> $DIR/copy-intrinsic.rs:33:5 | ||
| | ||
LL | copy_nonoverlapping(dangle, 0x100 as *mut i32, 0); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access failed: pointer must be in-bounds at offset 40, but is outside bounds of alloc6 which has size 4 | ||
|
||
error[E0080]: evaluation of constant value failed | ||
--> $DIR/copy-intrinsic.rs:40:5 | ||
| | ||
LL | copy(&x, &mut y, 1usize << (mem::size_of::<usize>() * 8 - 1)); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow computing total size of `copy` | ||
|
||
error[E0080]: evaluation of constant value failed | ||
--> $DIR/copy-intrinsic.rs:46:5 | ||
| | ||
LL | copy_nonoverlapping(&x, &mut y, 1usize << (mem::size_of::<usize>() * 8 - 1)); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow computing total size of `copy_nonoverlapping` | ||
|
||
error: aborting due to 4 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0080`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters