Skip to content

Commit a2e61ae

Browse files
RalfJungRalfJung
committed
rustup
1 parent 5974e7d commit a2e61ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+73
-73
lines changed

‎rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ddcbba036aee08f0709f98a92a342a278eae5c05
1+
bf45371f262e184b4a77adea88c8ac01ac79759b

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
// However, it drops provenance when transmuting to TwoPtrs, so this is UB.
1313
let val = unsafe {
1414
transmute::<_, &str>(
15-
//~^ ERROR type validation failed: encountered a dangling reference
15+
//~^ ERROR constructing invalid value: encountered a dangling reference
1616
!mask & transmute::<_, TwoPtrs>("false !")
1717
| mask & transmute::<_, TwoPtrs>("true !"),
1818
)

‎tests/fail/branchless-select-i128-pointer.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
error: Undefined Behavior: type validation failed: encountered a dangling reference (address $HEX is unallocated)
1+
error: Undefined Behavior: constructing invalid value: encountered a dangling reference (address $HEX is unallocated)
22
--> $DIR/branchless-select-i128-pointer.rs:LL:CC
33
|
44
LL | / transmute::<_, &str>(
55
LL | |
66
LL | | !mask & transmute::<_, TwoPtrs>("false !")
77
LL | | | mask & transmute::<_, TwoPtrs>("true !"),
88
LL | | )
9-
| |_____________^ type validation failed: encountered a dangling reference (address $HEX is unallocated)
9+
| |_____________^ constructing invalid value: encountered a dangling reference (address $HEX is unallocated)
1010
|
1111
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
1212
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/issue-miri-1112.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: type validation failed: encountered invalid drop function pointer in vtable (function has incompatible signature)
1+
error: Undefined Behavior: constructing invalid value: encountered invalid drop function pointer in vtable (function has incompatible signature)
22
--> $DIR/issue-miri-1112.rs:LL:CC
33
|
44
LL | let obj = std::mem::transmute::<FatPointer, *mut FunnyPointer>(obj);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered invalid drop function pointer in vtable (function has incompatible signature)
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered invalid drop function pointer in vtable (function has incompatible signature)
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/stacked_borrows/vtable.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: type validation failed: encountered vtable pointer does not have permission to read drop function pointer
1+
error: Undefined Behavior: constructing invalid value: encountered vtable pointer does not have permission to read drop function pointer
22
--> RUSTLIB/core/src/ptr/metadata.rs:LL:CC
33
|
44
LL | unsafe { PtrRepr { components: PtrComponents { data_address, metadata } }.const_ptr }
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered vtable pointer does not have permission to read drop function pointer
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered vtable pointer does not have permission to read drop function pointer
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/transmute-pair-uninit.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: type validation failed: encountered uninitialized bytes, but expected initialized bytes
1+
error: Undefined Behavior: constructing invalid value: encountered uninitialized bytes, but expected initialized bytes
22
--> $DIR/transmute-pair-uninit.rs:LL:CC
33
|
44
LL | let v = unsafe { *z.offset(first_undef) };
5-
| ^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized bytes, but expected initialized bytes
5+
| ^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered uninitialized bytes, but expected initialized bytes
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/transmute_fat1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const N: usize = 8;
77
fn main() {
88
let bad = unsafe {
99
std::mem::transmute::<&[u8], [u8; N]>(&[1u8])
10-
//~^ ERROR: type validation failed: encountered a pointer
10+
//~^ ERROR: constructing invalid value: encountered a pointer
1111
};
1212
let _val = bad[0] + bad[bad.len() - 1];
1313
}

‎tests/fail/transmute_fat1.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: type validation failed: encountered a pointer, but expected plain (non-pointer) bytes
1+
error: Undefined Behavior: constructing invalid value: encountered a pointer, but expected plain (non-pointer) bytes
22
--> $DIR/transmute_fat1.rs:LL:CC
33
|
44
LL | std::mem::transmute::<&[u8], [u8; N]>(&[1u8])
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected plain (non-pointer) bytes
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered a pointer, but expected plain (non-pointer) bytes
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/uninit_byte_read.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: Undefined Behavior: type validation failed: encountered uninitialized bytes, but expected initialized bytes
1+
error: Undefined Behavior: constructing invalid value: encountered uninitialized bytes, but expected initialized bytes
22
--> $DIR/uninit_byte_read.rs:LL:CC
33
|
44
LL | let undef = unsafe { *v.get_unchecked(5) };
5-
| ^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized bytes, but expected initialized bytes
5+
| ^^^^^^^^^^^^^^^^^^^ constructing invalid value: encountered uninitialized bytes, but expected initialized bytes
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/uninit_raw_ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fn main() {
22
let _val = unsafe { std::mem::MaybeUninit::<*const u8>::uninit().assume_init() };
3-
//~^ ERROR type validation failed at .value: encountered uninitialized raw pointer
3+
//~^ ERROR constructing invalid value at .value: encountered uninitialized raw pointer
44
}

0 commit comments

Comments
 (0)