diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 091e68cd066..e4b186736e2 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -413,6 +413,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
// We check overflow in debug mode already
// so should only check in release mode.
if !oflo_check
+ && prim.layout.ty.is_signed()
&& prim.to_bits()? == (1 << (prim.layout.size.bits() - 1)) {
throw_panic!(OverflowNeg)
}
diff --git a/src/test/ui/consts/const-err2.rs b/src/test/ui/consts/const-err2.rs
index a5f685a159b..cd6ac47bd92 100644
--- a/src/test/ui/consts/const-err2.rs
+++ b/src/test/ui/consts/const-err2.rs
@@ -5,6 +5,8 @@
#![feature(rustc_attrs)]
#![allow(exceeding_bitshifts)]
+// compile-flags: -C overflow-checks=on -O
+
#![deny(const_err)]
fn black_box<T>(_: T) {
diff --git a/src/test/ui/consts/const-err2.stderr b/src/test/ui/consts/const-err2.stderr
index 659c3afc618..ecfced7f0db 100644
--- a/src/test/ui/consts/const-err2.stderr
+++ b/src/test/ui/consts/const-err2.stderr
@@ -1,35 +1,35 @@
-error: this expression will panic at runtime
- --> $DIR/const-err2.rs:15:13
+error: attempt to negate with overflow
+ --> $DIR/const-err2.rs:17:13
|
LL | let a = -std::i8::MIN;
- | ^^^^^^^^^^^^^ attempt to negate with overflow
+ | ^^^^^^^^^^^^^
|
note: lint level defined here
- --> $DIR/const-err2.rs:8:9
+ --> $DIR/const-err2.rs:10:9
|
LL | #![deny(const_err)]
| ^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/const-err2.rs:17:13
- |
-LL | let b = 200u8 + 200u8 + 200u8;
- | ^^^^^^^^^^^^^ attempt to add with overflow
-
-error: this expression will panic at runtime
+error: attempt to add with overflow
--> $DIR/const-err2.rs:19:13
|
-LL | let c = 200u8 * 4;
- | ^^^^^^^^^ attempt to multiply with overflow
+LL | let b = 200u8 + 200u8 + 200u8;
+ | ^^^^^^^^^^^^^
-error: this expression will panic at runtime
+error: attempt to multiply with overflow
--> $DIR/const-err2.rs:21:13
|
+LL | let c = 200u8 * 4;
+ | ^^^^^^^^^
+
+error: attempt to subtract with overflow
+ --> $DIR/const-err2.rs:23:13
+ |
LL | let d = 42u8 - (42u8 + 1);
- | ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+ | ^^^^^^^^^^^^^^^^^
error: index out of bounds: the len is 1 but the index is 1
- --> $DIR/const-err2.rs:23:14
+ --> $DIR/const-err2.rs:25:14
|
LL | let _e = [5u8][1];
| ^^^^^^^^
diff --git a/src/test/ui/consts/const-eval/promoted_errors.rs b/src/test/ui/consts/const-eval/promoted_errors.rs
index cd989731452..7adb394144b 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.rs
+++ b/src/test/ui/consts/const-eval/promoted_errors.rs
@@ -1,11 +1,12 @@
-// compile-flags: -O
+// compile-flags: -C overflow-checks=on -O
#![deny(const_err)]
fn main() {
println!("{}", 0u32 - 1);
+ //~^ ERROR attempt to subtract with overflow
let _x = 0u32 - 1;
- //~^ ERROR this expression will panic at runtime [const_err]
+ //~^ ERROR attempt to subtract with overflow
println!("{}", 1/(1-1));
//~^ ERROR attempt to divide by zero [const_err]
//~| ERROR reaching this expression at runtime will panic or abort [const_err]
diff --git a/src/test/ui/consts/const-eval/promoted_errors.stderr b/src/test/ui/consts/const-eval/promoted_errors.stderr
index 40d5c73e866..fe63d0800dd 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.stderr
+++ b/src/test/ui/consts/const-eval/promoted_errors.stderr
@@ -1,8 +1,8 @@
-error: this expression will panic at runtime
- --> $DIR/promoted_errors.rs:7:14
+error: attempt to subtract with overflow
+ --> $DIR/promoted_errors.rs:6:20
|
-LL | let _x = 0u32 - 1;
- | ^^^^^^^^ attempt to subtract with overflow
+LL | println!("{}", 0u32 - 1);
+ | ^^^^^^^^
|
note: lint level defined here
--> $DIR/promoted_errors.rs:3:9
@@ -10,53 +10,59 @@ note: lint level defined here
LL | #![deny(const_err)]
| ^^^^^^^^^
+error: attempt to subtract with overflow
+ --> $DIR/promoted_errors.rs:8:14
+ |
+LL | let _x = 0u32 - 1;
+ | ^^^^^^^^
+
error: attempt to divide by zero
- --> $DIR/promoted_errors.rs:9:20
+ --> $DIR/promoted_errors.rs:10:20
|
LL | println!("{}", 1/(1-1));
| ^^^^^^^
error: reaching this expression at runtime will panic or abort
- --> $DIR/promoted_errors.rs:9:20
+ --> $DIR/promoted_errors.rs:10:20
|
LL | println!("{}", 1/(1-1));
| ^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/promoted_errors.rs:12:14
+ --> $DIR/promoted_errors.rs:13:14
|
LL | let _x = 1/(1-1);
| ^^^^^^^
error: this expression will panic at runtime
- --> $DIR/promoted_errors.rs:12:14
+ --> $DIR/promoted_errors.rs:13:14
|
LL | let _x = 1/(1-1);
| ^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/promoted_errors.rs:15:20
+ --> $DIR/promoted_errors.rs:16:20
|
LL | println!("{}", 1/(false as u32));
| ^^^^^^^^^^^^^^^^
error: reaching this expression at runtime will panic or abort
- --> $DIR/promoted_errors.rs:15:20
+ --> $DIR/promoted_errors.rs:16:20
|
LL | println!("{}", 1/(false as u32));
| ^^^^^^^^^^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/promoted_errors.rs:18:14
+ --> $DIR/promoted_errors.rs:19:14
|
LL | let _x = 1/(false as u32);
| ^^^^^^^^^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/promoted_errors.rs:18:14
+ --> $DIR/promoted_errors.rs:19:14
|
LL | let _x = 1/(false as u32);
| ^^^^^^^^^^^^^^^^ attempt to divide by zero
-error: aborting due to 9 previous errors
+error: aborting due to 10 previous errors
diff --git a/src/test/ui/consts/issue-64059.rs b/src/test/ui/consts/issue-64059.rs
index 30b8744cb7f..38911c3dcf6 100644
--- a/src/test/ui/consts/issue-64059.rs
+++ b/src/test/ui/consts/issue-64059.rs
@@ -1,4 +1,6 @@
+// compile-flags: -C overflow-checks=on -O
+// run-pass
+
fn main() {
let _ = -(-0.0);
- //~^ ERROR: this expression will panic at runtime
}
diff --git a/src/test/ui/consts/issue-64059.stderr b/src/test/ui/consts/issue-64059.stderr
deleted file mode 100644
index 6f27653421b..00000000000
--- a/src/test/ui/consts/issue-64059.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: this expression will panic at runtime
- --> $DIR/issue-64059.rs:2:13
- |
-LL | let _ = -(-0.0);
- | ^^^^^^^ attempt to negate with overflow
- |
- = note: `#[deny(const_err)]` on by default
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/issues/issue-8460-const.rs b/src/test/ui/issues/issue-8460-const.rs
index 611d280f774..c3f53e3298b 100644
--- a/src/test/ui/issues/issue-8460-const.rs
+++ b/src/test/ui/issues/issue-8460-const.rs
@@ -1,3 +1,5 @@
+// compile-flags: -C overflow-checks=on -O
+
#![deny(const_err)]
use std::{isize, i8, i16, i32, i64};
@@ -6,19 +8,14 @@ use std::thread;
fn main() {
assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
//~^ ERROR attempt to divide with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
//~^ ERROR attempt to divide by zero
//~| ERROR this expression will panic at runtime
@@ -36,19 +33,14 @@ fn main() {
//~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with overflow
- //~| ERROR this expression will panic at runtime
assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
//~^ ERROR attempt to calculate the remainder with a divisor of zero
//~| ERROR this expression will panic at runtime
diff --git a/src/test/ui/issues/issue-8460-const.stderr b/src/test/ui/issues/issue-8460-const.stderr
index 31b1da4f804..914323227dd 100644
--- a/src/test/ui/issues/issue-8460-const.stderr
+++ b/src/test/ui/issues/issue-8460-const.stderr
@@ -1,248 +1,188 @@
error: attempt to divide with overflow
- --> $DIR/issue-8460-const.rs:7:36
+ --> $DIR/issue-8460-const.rs:9:36
|
LL | assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
| ^^^^^^^^^^^^^^^
|
note: lint level defined here
- --> $DIR/issue-8460-const.rs:1:9
+ --> $DIR/issue-8460-const.rs:3:9
|
LL | #![deny(const_err)]
| ^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:7:36
- |
-LL | assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
- | ^^^^^^^^^^^^^^^ attempt to divide with overflow
-
error: attempt to divide with overflow
- --> $DIR/issue-8460-const.rs:10:36
+ --> $DIR/issue-8460-const.rs:11:36
|
LL | assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
| ^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:10:36
- |
-LL | assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
- | ^^^^^^^^^^^^ attempt to divide with overflow
-
error: attempt to divide with overflow
--> $DIR/issue-8460-const.rs:13:36
|
LL | assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
| ^^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:13:36
- |
-LL | assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
- | ^^^^^^^^^^^^^ attempt to divide with overflow
-
error: attempt to divide with overflow
- --> $DIR/issue-8460-const.rs:16:36
+ --> $DIR/issue-8460-const.rs:15:36
|
LL | assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
| ^^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:16:36
- |
-LL | assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
- | ^^^^^^^^^^^^^ attempt to divide with overflow
-
error: attempt to divide with overflow
- --> $DIR/issue-8460-const.rs:19:36
+ --> $DIR/issue-8460-const.rs:17:36
|
LL | assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
| ^^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:19:36
- |
-LL | assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
- | ^^^^^^^^^^^^^ attempt to divide with overflow
-
error: attempt to divide by zero
- --> $DIR/issue-8460-const.rs:22:36
+ --> $DIR/issue-8460-const.rs:19:36
|
LL | assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
| ^^^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:22:36
+ --> $DIR/issue-8460-const.rs:19:36
|
LL | assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
| ^^^^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/issue-8460-const.rs:25:36
+ --> $DIR/issue-8460-const.rs:22:36
|
LL | assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
| ^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:25:36
+ --> $DIR/issue-8460-const.rs:22:36
|
LL | assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
| ^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/issue-8460-const.rs:28:36
+ --> $DIR/issue-8460-const.rs:25:36
|
LL | assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
| ^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:28:36
+ --> $DIR/issue-8460-const.rs:25:36
|
LL | assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
| ^^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/issue-8460-const.rs:31:36
+ --> $DIR/issue-8460-const.rs:28:36
|
LL | assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
| ^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:31:36
+ --> $DIR/issue-8460-const.rs:28:36
|
LL | assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
| ^^^^^^^^ attempt to divide by zero
error: attempt to divide by zero
- --> $DIR/issue-8460-const.rs:34:36
+ --> $DIR/issue-8460-const.rs:31:36
|
LL | assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
| ^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:34:36
+ --> $DIR/issue-8460-const.rs:31:36
|
LL | assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
| ^^^^^^^^ attempt to divide by zero
error: attempt to calculate the remainder with overflow
- --> $DIR/issue-8460-const.rs:37:36
+ --> $DIR/issue-8460-const.rs:34:36
|
LL | assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
| ^^^^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:37:36
- |
-LL | assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
- | ^^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
error: attempt to calculate the remainder with overflow
- --> $DIR/issue-8460-const.rs:40:36
+ --> $DIR/issue-8460-const.rs:36:36
|
LL | assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
| ^^^^^^^^^^^^
-error: this expression will panic at runtime
+error: attempt to calculate the remainder with overflow
+ --> $DIR/issue-8460-const.rs:38:36
+ |
+LL | assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
+ | ^^^^^^^^^^^^^
+
+error: attempt to calculate the remainder with overflow
--> $DIR/issue-8460-const.rs:40:36
|
-LL | assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
- | ^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with overflow
- --> $DIR/issue-8460-const.rs:43:36
- |
-LL | assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
- | ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:43:36
- |
-LL | assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
- | ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with overflow
- --> $DIR/issue-8460-const.rs:46:36
- |
LL | assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
| ^^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:46:36
- |
-LL | assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
- | ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
error: attempt to calculate the remainder with overflow
- --> $DIR/issue-8460-const.rs:49:36
+ --> $DIR/issue-8460-const.rs:42:36
|
LL | assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
| ^^^^^^^^^^^^^
-error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:49:36
- |
-LL | assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
- | ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
error: attempt to calculate the remainder with a divisor of zero
- --> $DIR/issue-8460-const.rs:52:36
+ --> $DIR/issue-8460-const.rs:44:36
|
LL | assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
| ^^^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:52:36
+ --> $DIR/issue-8460-const.rs:44:36
|
LL | assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
| ^^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
error: attempt to calculate the remainder with a divisor of zero
- --> $DIR/issue-8460-const.rs:55:36
+ --> $DIR/issue-8460-const.rs:47:36
|
LL | assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
| ^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:55:36
+ --> $DIR/issue-8460-const.rs:47:36
|
LL | assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
| ^^^^^^^ attempt to calculate the remainder with a divisor of zero
error: attempt to calculate the remainder with a divisor of zero
- --> $DIR/issue-8460-const.rs:58:36
+ --> $DIR/issue-8460-const.rs:50:36
|
LL | assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
| ^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:58:36
+ --> $DIR/issue-8460-const.rs:50:36
|
LL | assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
| ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
error: attempt to calculate the remainder with a divisor of zero
- --> $DIR/issue-8460-const.rs:61:36
+ --> $DIR/issue-8460-const.rs:53:36
|
LL | assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
| ^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:61:36
+ --> $DIR/issue-8460-const.rs:53:36
|
LL | assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
| ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
error: attempt to calculate the remainder with a divisor of zero
- --> $DIR/issue-8460-const.rs:64:36
+ --> $DIR/issue-8460-const.rs:56:36
|
LL | assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
| ^^^^^^^^
error: this expression will panic at runtime
- --> $DIR/issue-8460-const.rs:64:36
+ --> $DIR/issue-8460-const.rs:56:36
|
LL | assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
| ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
-error: aborting due to 40 previous errors
+error: aborting due to 30 previous errors