Skip to content

Miri and miri-related code contains repetitions of (n << amt) >> amt #56233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2019
Merged

Miri and miri-related code contains repetitions of (n << amt) >> amt #56233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a338351
reduce some code repetitions
kenta7777 Dec 10, 2018
b80332e
cast the sign_extend result to i128.
kenta7777 Jan 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/librustc_lint/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ use syntax::source_map;

use rustc::hir;

use rustc::mir::interpret::{sign_extend, truncate};

declare_lint! {
UNUSED_COMPARISONS,
Warn,
Expand Down Expand Up @@ -368,14 +370,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
let (t, actually) = match ty {
ty::Int(t) => {
let ity = attr::IntType::SignedInt(t);
let bits = layout::Integer::from_attr(&cx.tcx, ity).size().bits();
let actually = (val << (128 - bits)) as i128 >> (128 - bits);
let size = layout::Integer::from_attr(&cx.tcx, ity).size();
let actually = sign_extend(val, size) as i128;
(format!("{:?}", t), actually.to_string())
}
ty::Uint(t) => {
let ity = attr::IntType::UnsignedInt(t);
let bits = layout::Integer::from_attr(&cx.tcx, ity).size().bits();
let actually = (val << (128 - bits)) >> (128 - bits);
let size = layout::Integer::from_attr(&cx.tcx, ity).size();
let actually = truncate(val, size);
(format!("{:?}", t), actually.to_string())
}
_ => bug!(),
Expand Down