Skip to content

Commit f78aef8

Browse files
scottmcmscottmcm
committed
Remove Rvalue::CheckedBinaryOp 
1 parent ee97564 commit f78aef8

File tree

55 files changed

+196
-185
lines changed

Some content is hidden

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

55 files changed

+196
-185
lines changed

‎compiler/rustc_borrowck/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,8 +1312,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
13121312
);
13131313
}
13141314

1315-
Rvalue::BinaryOp(_bin_op, box (operand1, operand2))
1316-
| Rvalue::CheckedBinaryOp(_bin_op, box (operand1, operand2)) => {
1315+
Rvalue::BinaryOp(_bin_op, box (operand1, operand2)) => {
13171316
self.consume_operand(location, (operand1, span), flow_state);
13181317
self.consume_operand(location, (operand2, span), flow_state);
13191318
}

‎compiler/rustc_borrowck/src/polonius/loan_invalidations.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,7 @@ impl<'cx, 'tcx> LoanInvalidationsGenerator<'cx, 'tcx> {
302302
);
303303
}
304304

305-
Rvalue::BinaryOp(_bin_op, box (operand1, operand2))
306-
| Rvalue::CheckedBinaryOp(_bin_op, box (operand1, operand2)) => {
305+
Rvalue::BinaryOp(_bin_op, box (operand1, operand2)) => {
307306
self.consume_operand(location, operand1);
308307
self.consume_operand(location, operand2);
309308
}

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,8 +2417,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
24172417
self.check_operand(op, location);
24182418
}
24192419

2420-
Rvalue::BinaryOp(_, box (left, right))
2421-
| Rvalue::CheckedBinaryOp(_, box (left, right)) => {
2420+
Rvalue::BinaryOp(_, box (left, right)) => {
24222421
self.check_operand(left, location);
24232422
self.check_operand(right, location);
24242423
}
@@ -2445,7 +2444,6 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
24452444
| Rvalue::Cast(..)
24462445
| Rvalue::ShallowInitBox(..)
24472446
| Rvalue::BinaryOp(..)
2448-
| Rvalue::CheckedBinaryOp(..)
24492447
| Rvalue::NullaryOp(..)
24502448
| Rvalue::CopyForDeref(..)
24512449
| Rvalue::UnaryOp(..)

‎compiler/rustc_codegen_ssa/src/mir/rvalue.rs

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,22 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
572572
}
573573
}
574574

575+
mir::Rvalue::BinaryOp(op_with_overflow, box (ref lhs, ref rhs))
576+
if let Some(op) = op_with_overflow.overflowing_to_wrapping() =>
577+
{
578+
let lhs = self.codegen_operand(bx, lhs);
579+
let rhs = self.codegen_operand(bx, rhs);
580+
let result = self.codegen_scalar_checked_binop(
581+
bx,
582+
op,
583+
lhs.immediate(),
584+
rhs.immediate(),
585+
lhs.layout.ty,
586+
);
587+
let val_ty = op.ty(bx.tcx(), lhs.layout.ty, rhs.layout.ty);
588+
let operand_ty = Ty::new_tup(bx.tcx(), &[val_ty, bx.tcx().types.bool]);
589+
OperandRef { val: result, layout: bx.cx().layout_of(operand_ty) }
590+
}
575591
mir::Rvalue::BinaryOp(op, box (ref lhs, ref rhs)) => {
576592
let lhs = self.codegen_operand(bx, lhs);
577593
let rhs = self.codegen_operand(bx, rhs);
@@ -600,20 +616,6 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
600616
layout: bx.cx().layout_of(op.ty(bx.tcx(), lhs.layout.ty, rhs.layout.ty)),
601617
}
602618
}
603-
mir::Rvalue::CheckedBinaryOp(op, box (ref lhs, ref rhs)) => {
604-
let lhs = self.codegen_operand(bx, lhs);
605-
let rhs = self.codegen_operand(bx, rhs);
606-
let result = self.codegen_scalar_checked_binop(
607-
bx,
608-
op,
609-
lhs.immediate(),
610-
rhs.immediate(),
611-
lhs.layout.ty,
612-
);
613-
let val_ty = op.ty(bx.tcx(), lhs.layout.ty, rhs.layout.ty);
614-
let operand_ty = Ty::new_tup(bx.tcx(), &[val_ty, bx.tcx().types.bool]);
615-
OperandRef { val: result, layout: bx.cx().layout_of(operand_ty) }
616-
}
617619

618620
mir::Rvalue::UnaryOp(op, ref operand) => {
619621
let operand = self.codegen_operand(bx, operand);
@@ -792,7 +794,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
792794
debug_assert!(
793795
if bx.cx().type_has_metadata(ty) {
794796
matches!(val, OperandValue::Pair(..))
795-
} else {
797+
} else {
796798
matches!(val, OperandValue::Immediate(..))
797799
},
798800
"Address of place was unexpectedly {val:?} for pointee type {ty:?}",
@@ -938,6 +940,11 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
938940
bx.select(is_lt, bx.cx().const_i8(Ordering::Less as i8), ge)
939941
}
940942
}
943+
mir::BinOp::AddWithOverflow
944+
| mir::BinOp::SubWithOverflow
945+
| mir::BinOp::MulWithOverflow => {
946+
bug!("{op:?} needs to return a pair, so call codegen_scalar_checked_binop instead")
947+
}
941948
}
942949
}
943950

@@ -1050,7 +1057,6 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
10501057
mir::Rvalue::Cast(..) | // (*)
10511058
mir::Rvalue::ShallowInitBox(..) | // (*)
10521059
mir::Rvalue::BinaryOp(..) |
1053-
mir::Rvalue::CheckedBinaryOp(..) |
10541060
mir::Rvalue::UnaryOp(..) |
10551061
mir::Rvalue::Discriminant(..) |
10561062
mir::Rvalue::NullaryOp(..) |

‎compiler/rustc_const_eval/src/interpret/step.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
166166
let left = self.read_immediate(&self.eval_operand(left, layout)?)?;
167167
let layout = util::binop_right_homogeneous(bin_op).then_some(left.layout);
168168
let right = self.read_immediate(&self.eval_operand(right, layout)?)?;
169-
self.binop_ignore_overflow(bin_op, &left, &right, &dest)?;
170-
}
171-
172-
CheckedBinaryOp(bin_op, box (ref left, ref right)) => {
173-
// Due to the extra boolean in the result, we can never reuse the `dest.layout`.
174-
let left = self.read_immediate(&self.eval_operand(left, None)?)?;
175-
let layout = util::binop_right_homogeneous(bin_op).then_some(left.layout);
176-
let right = self.read_immediate(&self.eval_operand(right, layout)?)?;
177-
self.binop_with_overflow(bin_op, &left, &right, &dest)?;
169+
if let Some(bin_op) = bin_op.overflowing_to_wrapping() {
170+
self.binop_with_overflow(bin_op, &left, &right, &dest)?;
171+
} else {
172+
self.binop_ignore_overflow(bin_op, &left, &right, &dest)?;
173+
}
178174
}
179175

180176
UnaryOp(un_op, ref operand) => {

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
579579
}
580580
}
581581

582-
Rvalue::BinaryOp(op, box (lhs, rhs)) | Rvalue::CheckedBinaryOp(op, box (lhs, rhs)) => {
582+
Rvalue::BinaryOp(op, box (lhs, rhs)) => {
583583
let lhs_ty = lhs.ty(self.body, self.tcx);
584584
let rhs_ty = rhs.ty(self.body, self.tcx);
585585

‎compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ where
260260
| Rvalue::Cast(_, operand, _)
261261
| Rvalue::ShallowInitBox(operand, _) => in_operand::<Q, _>(cx, in_local, operand),
262262

263-
Rvalue::BinaryOp(_, box (lhs, rhs)) | Rvalue::CheckedBinaryOp(_, box (lhs, rhs)) => {
263+
Rvalue::BinaryOp(_, box (lhs, rhs)) => {
264264
in_operand::<Q, _>(cx, in_local, lhs) || in_operand::<Q, _>(cx, in_local, rhs)
265265
}
266266

‎compiler/rustc_const_eval/src/transform/check_consts/resolver.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ where
200200
| mir::Rvalue::Repeat(..)
201201
| mir::Rvalue::Len(..)
202202
| mir::Rvalue::BinaryOp(..)
203-
| mir::Rvalue::CheckedBinaryOp(..)
204203
| mir::Rvalue::NullaryOp(..)
205204
| mir::Rvalue::UnaryOp(..)
206205
| mir::Rvalue::Discriminant(..)

‎compiler/rustc_const_eval/src/transform/validate.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,14 +1064,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
10641064
)
10651065
}
10661066
}
1067-
}
1068-
}
1069-
Rvalue::CheckedBinaryOp(op, vals) => {
1070-
use BinOp::*;
1071-
let a = vals.0.ty(&self.body.local_decls, self.tcx);
1072-
let b = vals.1.ty(&self.body.local_decls, self.tcx);
1073-
match op {
1074-
Add | Sub | Mul => {
1067+
AddWithOverflow | SubWithOverflow | MulWithOverflow => {
10751068
for x in [a, b] {
10761069
check_kinds!(
10771070
x,
@@ -1088,7 +1081,6 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
10881081
);
10891082
}
10901083
}
1091-
_ => self.fail(location, format!("There is no checked version of {op:?}")),
10921084
}
10931085
}
10941086
Rvalue::UnaryOp(op, operand) => {

‎compiler/rustc_const_eval/src/util/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ pub fn binop_left_homogeneous(op: mir::BinOp) -> bool {
1919
match op {
2020
Add | AddUnchecked | Sub | SubUnchecked | Mul | MulUnchecked | Div | Rem | BitXor
2121
| BitAnd | BitOr | Offset | Shl | ShlUnchecked | Shr | ShrUnchecked => true,
22-
Eq | Ne | Lt | Le | Gt | Ge | Cmp => false,
22+
AddWithOverflow | SubWithOverflow | MulWithOverflow | Eq | Ne | Lt | Le | Gt | Ge | Cmp => {
23+
false
24+
}
2325
}
2426
}
2527

@@ -29,8 +31,9 @@ pub fn binop_left_homogeneous(op: mir::BinOp) -> bool {
2931
pub fn binop_right_homogeneous(op: mir::BinOp) -> bool {
3032
use rustc_middle::mir::BinOp::*;
3133
match op {
32-
Add | AddUnchecked | Sub | SubUnchecked | Mul | MulUnchecked | Div | Rem | BitXor
33-
| BitAnd | BitOr | Eq | Ne | Lt | Le | Gt | Ge | Cmp => true,
34+
Add | AddUnchecked | AddWithOverflow | Sub | SubUnchecked | SubWithOverflow | Mul
35+
| MulUnchecked | MulWithOverflow | Div | Rem | BitXor | BitAnd | BitOr | Eq | Ne | Lt
36+
| Le | Gt | Ge | Cmp => true,
3437
Offset | Shl | ShlUnchecked | Shr | ShrUnchecked => false,
3538
}
3639
}

0 commit comments

Comments
 (0)