-
Notifications
You must be signed in to change notification settings - Fork 12.5k
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 #95169 - Smittyvb:union-test-ub, r=bjorn3
Don't run UB in test suite This splits `ui/unsafe/union.rs` to make it so only the non-UB parts are run. It also means we can do more testing of the location of error messages (which are a bit different with the THIR unsafety checker). `union-modification.rs` has no UB (according to Miri), and `union.rs` has errors (but would have UB if not for those errors). Closes #95075. r? `@bjorn3`
- Loading branch information
Showing
4 changed files
with
107 additions
and
54 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
// run-pass | ||
// revisions: mir thir | ||
// [thir]compile-flags: -Z thir-unsafeck | ||
|
||
#![feature(untagged_unions)] | ||
|
||
union Foo { | ||
bar: i8, | ||
_blah: isize, | ||
_zst: (), | ||
} | ||
|
||
struct FooHolder { | ||
inner_foo: Foo | ||
} | ||
|
||
fn do_nothing(_x: &mut Foo) {} | ||
|
||
pub fn main() { | ||
let mut foo = Foo { bar: 5 }; | ||
do_nothing(&mut foo); | ||
foo.bar = 6; | ||
unsafe { foo.bar += 1; } | ||
assert_eq!(unsafe { foo.bar }, 7); | ||
unsafe { | ||
let Foo { bar: inner } = foo; | ||
assert_eq!(inner, 7); | ||
} | ||
|
||
let foo = Foo { bar: 5 }; | ||
let foo = if let 3 = if let true = true { 3 } else { 4 } { foo } else { foo }; | ||
|
||
let (_foo2, _random) = (foo, 42); | ||
|
||
let mut foo_holder = FooHolder { inner_foo: Foo { bar: 5 } }; | ||
foo_holder.inner_foo.bar = 4; | ||
assert_eq!(unsafe { foo_holder.inner_foo.bar }, 4); | ||
drop(foo_holder); | ||
} |
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 |
---|---|---|
@@ -1,16 +1,19 @@ | ||
warning: unnecessary `unsafe` block | ||
--> $DIR/union.rs:61:5 | ||
error[E0133]: access to union field is unsafe and requires unsafe function or block | ||
--> $DIR/union.rs:30:20 | ||
| | ||
LL | unsafe { | ||
| ^^^^^^ unnecessary `unsafe` block | ||
LL | Foo { bar: _a } => {}, | ||
| ^^ access to union field | ||
| | ||
= note: `#[warn(unused_unsafe)]` on by default | ||
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior | ||
|
||
warning: unnecessary `unsafe` block | ||
--> $DIR/union.rs:66:5 | ||
error[E0133]: access to union field is unsafe and requires unsafe function or block | ||
--> $DIR/union.rs:32:11 | ||
| | ||
LL | unsafe { | ||
| ^^^^^^ unnecessary `unsafe` block | ||
LL | match foo { | ||
| ^^^ access to union field | ||
| | ||
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior | ||
|
||
warning: 2 warnings emitted | ||
error: aborting due to 2 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0133`. |
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,38 @@ | ||
error[E0133]: access to union field is unsafe and requires unsafe function or block | ||
--> $DIR/union.rs:30:20 | ||
| | ||
LL | Foo { bar: _a } => {}, | ||
| ^^ access to union field | ||
| | ||
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior | ||
|
||
error[E0133]: access to union field is unsafe and requires unsafe function or block | ||
--> $DIR/union.rs:34:20 | ||
| | ||
LL | pizza: Pizza { | ||
| ____________________^ | ||
LL | | topping: Some(PizzaTopping::Cheese) | Some(PizzaTopping::Pineapple) | None | ||
LL | | } | ||
| |_____________^ access to union field | ||
| | ||
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior | ||
|
||
error[E0133]: access to union field is unsafe and requires unsafe function or block | ||
--> $DIR/union.rs:42:20 | ||
| | ||
LL | Foo { zst: () } => {}, | ||
| ^^ access to union field | ||
| | ||
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior | ||
|
||
error[E0133]: access to union field is unsafe and requires unsafe function or block | ||
--> $DIR/union.rs:45:22 | ||
| | ||
LL | Foo { pizza: Pizza { .. } } => {}, | ||
| ^^^^^^^^^^^^ access to union field | ||
| | ||
= note: the field may not be properly initialized: using uninitialized data will cause undefined behavior | ||
|
||
error: aborting due to 4 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0133`. |