Skip to content

Change enum->int casts to not go through MIR casts. #96862

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
bors merged 4 commits into from
Jul 5, 2022
Merged

Change enum->int casts to not go through MIR casts. #96862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e674b3
Some tracing cleanups
oli-obk Jun 29, 2022
7839cb9
Change enum->int casts to not go through MIR casts.
oli-obk Jun 29, 2022
c3aec30
Add a helper method with an explicit name instead of hand rolling a m…
oli-obk Jul 5, 2022
82c73af
Prefer trace level instrumentation for the new noisy instrument attri…
oli-obk Jul 5, 2022
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
Prev Previous commit
Next Next commit
Add a helper method with an explicit name instead of hand rolling a m… 
…atch 3x
  • Loading branch information
@oli-obk
oli-obk committed Jul 5, 2022
commit c3aec3056e3c88bfc63db5cd4dc24624be7c576a
6 changes: 3 additions & 3 deletions compiler/rustc_codegen_ssa/src/mir/rvalue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {

let newval = match (r_t_in, r_t_out) {
(CastTy::Int(i), CastTy::Int(_)) => {
bx.intcast(llval, ll_t_out, matches!(i, IntTy::I))
bx.intcast(llval, ll_t_out, i.is_signed())
}
(CastTy::Float, CastTy::Float) => {
let srcsz = bx.cx().float_width(ll_t_in);
Expand All @@ -300,7 +300,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
}
}
(CastTy::Int(i), CastTy::Float) => {
if matches!(i, IntTy::I) {
if i.is_signed() {
bx.sitofp(llval, ll_t_out)
} else {
bx.uitofp(llval, ll_t_out)
Expand All @@ -311,7 +311,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
}
(CastTy::Int(i), CastTy::Ptr(_)) => {
let usize_llval =
bx.intcast(llval, bx.cx().type_isize(), matches!(i, IntTy::I));
bx.intcast(llval, bx.cx().type_isize(), i.is_signed());
bx.inttoptr(usize_llval, ll_t_out)
}
(CastTy::Float, CastTy::Int(IntTy::I)) => {
Expand Down
6 changes: 6 additions & 0 deletions compiler/rustc_middle/src/ty/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ pub enum IntTy {
Char,
}

impl IntTy {
pub fn is_signed(self) -> bool {
matches!(self, Self::I)
}
}

// Valid types for the result of a non-coercion cast
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum CastTy<'tcx> {
Expand Down