diff options
| author | Ralf Jung <post@ralfj.de> | 2023-04-22 10:35:35 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-04-22 10:35:35 +0200 |
| commit | cf3255865ff4a7920e3daf84be156e6cb660cdf9 (patch) | |
| tree | a1b37c889d1f6b74d2561c69fbf69b9e8e0f3545 | |
| parent | 0d6736eb0f63ad220603135f3f6e3ce307b9293c (diff) | |
| parent | f56b6d0b12009fb1e124de0a5ccdf956816225a6 (diff) | |
| download | rust-cf3255865ff4a7920e3daf84be156e6cb660cdf9.tar.gz rust-cf3255865ff4a7920e3daf84be156e6cb660cdf9.zip | |
Merge from rustc
| -rw-r--r-- | src/tools/miri/tests/fail/const-ub-checks.stderr | 6 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/erroneous_const2.stderr | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/tools/miri/tests/fail/const-ub-checks.stderr b/src/tools/miri/tests/fail/const-ub-checks.stderr index a8b7ea242b9..596a6bb4ca8 100644 --- a/src/tools/miri/tests/fail/const-ub-checks.stderr +++ b/src/tools/miri/tests/fail/const-ub-checks.stderr @@ -4,6 +4,12 @@ error[E0080]: evaluation of constant value failed LL | ptr.read(); | ^^^^^^^^^^ accessing memory with alignment ALIGN, but alignment ALIGN is required +note: erroneous constant used + --> $DIR/const-ub-checks.rs:LL:CC + | +LL | let _x = UNALIGNED_READ; + | ^^^^^^^^^^^^^^ + error: aborting due to previous error For more information about this error, try `rustc --explain E0080`. diff --git a/src/tools/miri/tests/fail/erroneous_const2.stderr b/src/tools/miri/tests/fail/erroneous_const2.stderr index d41fcfd2302..9aad1fc9b02 100644 --- a/src/tools/miri/tests/fail/erroneous_const2.stderr +++ b/src/tools/miri/tests/fail/erroneous_const2.stderr @@ -4,6 +4,20 @@ error[E0080]: evaluation of constant value failed LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ^^^^^ attempt to compute `5_u32 - 6_u32`, which would overflow +note: erroneous constant used + --> $DIR/erroneous_const2.rs:LL:CC + | +LL | println!("{}", FOO); + | ^^^ + +note: erroneous constant used + --> $DIR/erroneous_const2.rs:LL:CC + | +LL | println!("{}", FOO); + | ^^^ + | + = note: this note originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info) + error: aborting due to previous error For more information about this error, try `rustc --explain E0080`. |