Auto merge of rust-lang#114841 - bvanjoi:fix-114814, r=<try>

fix: add track_caller attr for div and mod

Fixes rust-lang#114814

`#[track_caller]` is works, r? `@scottmcm`

Author: bors

library/core/src/ops/arith.rs

@@ -86,6 +86,7 @@ pub trait Add<Rhs = Self> {
     /// assert_eq!(12 + 1, 13);
     /// ```
     #[must_use = "this returns the result of the operation, without modifying the original"]
+    #[track_caller]
     #[rustc_diagnostic_item = "add"]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn add(self, rhs: Rhs) -> Self::Output;
@@ -194,6 +195,7 @@ pub trait Sub<Rhs = Self> {
     /// assert_eq!(12 - 1, 11);
     /// ```
     #[must_use = "this returns the result of the operation, without modifying the original"]
+    #[track_caller]
     #[rustc_diagnostic_item = "sub"]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn sub(self, rhs: Rhs) -> Self::Output;
@@ -323,6 +325,7 @@ pub trait Mul<Rhs = Self> {
     /// assert_eq!(12 * 2, 24);
     /// ```
     #[must_use = "this returns the result of the operation, without modifying the original"]
+    #[track_caller]
     #[rustc_diagnostic_item = "mul"]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn mul(self, rhs: Rhs) -> Self::Output;
@@ -456,6 +459,7 @@ pub trait Div<Rhs = Self> {
     /// assert_eq!(12 / 2, 6);
     /// ```
     #[must_use = "this returns the result of the operation, without modifying the original"]
+    #[track_caller]
     #[rustc_diagnostic_item = "div"]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn div(self, rhs: Rhs) -> Self::Output;
@@ -557,6 +561,7 @@ pub trait Rem<Rhs = Self> {
     /// assert_eq!(12 % 10, 2);
     /// ```
     #[must_use = "this returns the result of the operation, without modifying the original"]
+    #[track_caller]
     #[rustc_diagnostic_item = "rem"]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn rem(self, rhs: Rhs) -> Self::Output;
@@ -740,6 +745,7 @@ pub trait AddAssign<Rhs = Self> {
     /// x += 1;
     /// assert_eq!(x, 13);
     /// ```
+    #[track_caller]
     #[stable(feature = "op_assign_traits", since = "1.8.0")]
     fn add_assign(&mut self, rhs: Rhs);
 }
@@ -806,6 +812,7 @@ pub trait SubAssign<Rhs = Self> {
     /// x -= 1;
     /// assert_eq!(x, 11);
     /// ```
+    #[track_caller]
     #[stable(feature = "op_assign_traits", since = "1.8.0")]
     fn sub_assign(&mut self, rhs: Rhs);
 }
@@ -863,6 +870,7 @@ pub trait MulAssign<Rhs = Self> {
     /// x *= 2;
     /// assert_eq!(x, 24);
     /// ```
+    #[track_caller]
     #[stable(feature = "op_assign_traits", since = "1.8.0")]
     fn mul_assign(&mut self, rhs: Rhs);
 }
@@ -920,6 +928,7 @@ pub trait DivAssign<Rhs = Self> {
     /// x /= 2;
     /// assert_eq!(x, 6);
     /// ```
+    #[track_caller]
     #[stable(feature = "op_assign_traits", since = "1.8.0")]
     fn div_assign(&mut self, rhs: Rhs);
 }
@@ -980,6 +989,7 @@ pub trait RemAssign<Rhs = Self> {
     /// x %= 10;
     /// assert_eq!(x, 2);
     /// ```
+    #[track_caller]
     #[stable(feature = "op_assign_traits", since = "1.8.0")]
     fn rem_assign(&mut self, rhs: Rhs);
 }

tests/mir-opt/const_prop/inherit_overflow.main.ConstProp.panic-abort.diff

@@ -8,7 +8,7 @@
       let mut _3: u8;
       scope 1 {
       }
-      scope 2 (inlined <u8 as Add>::add) {
+      scope 2 (inlined #[track_caller] <u8 as Add>::add) {
           debug self => _2;
           debug other => _3;
           let mut _4: (u8, bool);

tests/mir-opt/const_prop/inherit_overflow.main.ConstProp.panic-unwind.diff

@@ -8,7 +8,7 @@
       let mut _3: u8;
       scope 1 {
       }
-      scope 2 (inlined <u8 as Add>::add) {
+      scope 2 (inlined #[track_caller] <u8 as Add>::add) {
           debug self => _2;
           debug other => _3;
           let mut _4: (u8, bool);

tests/mir-opt/dataflow-const-prop/inherit_overflow.main.DataflowConstProp.panic-abort.diff

@@ -8,7 +8,7 @@
       let mut _3: u8;
       scope 1 {
       }
-      scope 2 (inlined <u8 as Add>::add) {
+      scope 2 (inlined #[track_caller] <u8 as Add>::add) {
           debug self => _2;
           debug other => _3;
           let mut _4: (u8, bool);

tests/mir-opt/dataflow-const-prop/inherit_overflow.main.DataflowConstProp.panic-unwind.diff

@@ -8,7 +8,7 @@
       let mut _3: u8;
       scope 1 {
       }
-      scope 2 (inlined <u8 as Add>::add) {
+      scope 2 (inlined #[track_caller] <u8 as Add>::add) {
           debug self => _2;
           debug other => _3;
           let mut _4: (u8, bool);

tests/ui/numbers-arithmetic/location-add-assign-overflow.rs

@@ -0,0 +1,8 @@
+// run-fail
+// check-run-results
+// error-pattern:location-add-assign-overflow.rs
+
+fn main() {
+    let mut a: u8 = 255;
+    a += &1;
+}

tests/ui/numbers-arithmetic/location-add-assign-overflow.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-add-assign-overflow.rs:7:5:
+attempt to add with overflow
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-add-overflow.rs

@@ -0,0 +1,7 @@
+// run-fail
+// check-run-results
+// error-pattern:location-add-overflow.rs
+
+fn main() {
+    let _: u8 = 255 + &1;
+}

tests/ui/numbers-arithmetic/location-add-overflow.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-add-overflow.rs:6:17:
+attempt to add with overflow
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-divide-assign-by-zero.rs

@@ -0,0 +1,8 @@
+// run-fail
+// check-run-results
+// error-pattern:location-divide-assign-by-zero.rs
+
+fn main() {
+    let mut a = 1;
+    a /= &0;
+}

tests/ui/numbers-arithmetic/location-divide-assign-by-zero.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-divide-assign-by-zero.rs:7:5:
+attempt to divide by zero
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-divide-by-zero.rs

@@ -0,0 +1,9 @@
+// run-fail
+// check-run-results
+// error-pattern:location-divide-by-zero.rs
+
+// https://github.com/rust-lang/rust/issues/114814
+
+fn main() {
+    let _ = 1 / &0;
+}

tests/ui/numbers-arithmetic/location-divide-by-zero.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-divide-by-zero.rs:8:13:
+attempt to divide by zero
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-mod-assign-by-zero.rs

@@ -0,0 +1,8 @@
+// run-fail
+// check-run-results
+// error-pattern:location-mod-assign-by-zero.rs
+
+fn main() {
+    let mut a = 1;
+    a %= &0;
+}

tests/ui/numbers-arithmetic/location-mod-assign-by-zero.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-mod-assign-by-zero.rs:7:5:
+attempt to calculate the remainder with a divisor of zero
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-mod-by-zero.rs

@@ -0,0 +1,7 @@
+// run-fail
+// check-run-results
+// error-pattern:location-mod-by-zero.rs
+
+fn main() {
+    let _ = 1 % &0;
+}

tests/ui/numbers-arithmetic/location-mod-by-zero.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-mod-by-zero.rs:6:13:
+attempt to calculate the remainder with a divisor of zero
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-mul-assign-overflow.rs

@@ -0,0 +1,8 @@
+// run-fail
+// check-run-results
+// error-pattern:location-mul-assign-overflow.rs
+
+fn main() {
+    let mut a: u8 = 255;
+    a *= &2;
+}

tests/ui/numbers-arithmetic/location-mul-assign-overflow.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-mul-assign-overflow.rs:7:5:
+attempt to multiply with overflow
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-mul-overflow.rs

@@ -0,0 +1,7 @@
+// run-fail
+// check-run-results
+// error-pattern:location-mul-overflow.rs
+
+fn main() {
+    let _: u8 = 255 * &2;
+}

tests/ui/numbers-arithmetic/location-mul-overflow.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-mul-overflow.rs:6:17:
+attempt to multiply with overflow
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-sub-assign-overflow.rs

@@ -0,0 +1,8 @@
+// run-fail
+// check-run-results
+// error-pattern:location-sub-assign-overflow.rs
+
+fn main() {
+    let mut a: u8 = 0;
+    a -= &1;
+}

tests/ui/numbers-arithmetic/location-sub-assign-overflow.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-sub-assign-overflow.rs:7:5:
+attempt to subtract with overflow
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/numbers-arithmetic/location-sub-overflow.rs

@@ -0,0 +1,7 @@
+// run-fail
+// check-run-results
+// error-pattern:location-sub-overflow.rs
+
+fn main() {
+    let _: u8 = 0 - &1;
+}

tests/ui/numbers-arithmetic/location-sub-overflow.run.stderr

@@ -0,0 +1,3 @@
+thread 'main' panicked at $DIR/location-sub-overflow.rs:6:17:
+attempt to subtract with overflow
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace