nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 17:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand validator to be more precise on checked binary ops

Browse Source
This commit is contained in:
Jakob Degen 2022-05-05 21:15:20 -04:00
parent e209e85e39
commit 5289bbece3
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
compiler/rustc_const_eval/src/transform/validate.rs
View File

@ -291,7 +291,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
ty::Array(..) | ty::Slice(..) ty::Array(..) | ty::Slice(..)
); );
} }
Rvalue::BinaryOp(op, vals) | Rvalue::CheckedBinaryOp(op, vals) => { Rvalue::BinaryOp(op, vals) => {
use BinOp::*; use BinOp::*;
let a = vals.0.ty(&self.body.local_decls, self.tcx); let a = vals.0.ty(&self.body.local_decls, self.tcx);
let b = vals.1.ty(&self.body.local_decls, self.tcx); let b = vals.1.ty(&self.body.local_decls, self.tcx);
@ -355,19 +355,57 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
for x in [a, b] { for x in [a, b] {
check_kinds!( check_kinds!(
x, x,
"Cannot perform op on type {:?}", "Cannot perform arithmetic on type {:?}",
ty::Uint(..) | ty::Int(..) | ty::Float(..) ty::Uint(..) | ty::Int(..) | ty::Float(..)
) )
} }
if a != b { if a != b {
self.fail( self.fail(
location, location,
format!("Cannot perform op on unequal types {:?} and {:?}", a, b), format!(
"Cannot perform arithmetic on unequal types {:?} and {:?}",
a, b
),
); );
} }
} }
} }
} }
Rvalue::CheckedBinaryOp(op, vals) => {
use BinOp::*;
let a = vals.0.ty(&self.body.local_decls, self.tcx);
let b = vals.1.ty(&self.body.local_decls, self.tcx);
match op {
Add | Sub | Mul => {
for x in [a, b] {
check_kinds!(
x,
"Cannot perform checked arithmetic on type {:?}",
ty::Uint(..) | ty::Int(..)
)
}
if a != b {
self.fail(
location,
format!(
"Cannot perform checked arithmetic on unequal types {:?} and {:?}",
a, b
),
);
}
}
Shl | Shr => {
for x in [a, b] {
check_kinds!(
x,
"Cannot perform checked shift on non-integer type {:?}",
ty::Uint(..) | ty::Int(..)
)
}
}
_ => self.fail(location, format!("There is no checked version of {:?}", op)),
}
}
Rvalue::UnaryOp(op, operand) => { Rvalue::UnaryOp(op, operand) => {
let a = operand.ty(&self.body.local_decls, self.tcx); let a = operand.ty(&self.body.local_decls, self.tcx);
match op { match op {