user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reuse sign_extend helper

Browse source
This commit is contained in:
Oli Scherer 2025-07-29 08:43:10 +00:00
parent 75bdbf25e3
commit 219bad4946
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_abi/src/layout.rs
View file

@ -769,7 +769,6 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
let discr_type = repr.discr_type();
let discr_int = Integer::from_attr(dl, discr_type);
let bits = discr_int.size().bits();
// Because we can only represent one range of valid values, we'll look for the
// largest range of invalid values and pick everything else as the range of valid
// values.
@ -780,7 +779,8 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
.map(|(_, val)| {
if discr_type.is_signed() {
// sign extend the raw representation to be an i128
(val << (128 - bits)) >> (128 - bits)
// FIXME: do this at the discriminant iterator creation sites
discr_int.size().sign_extend(val as u128)
} else {
val
}

2
compiler/rustc_middle/src/ty/util.rs
View file

@ -32,7 +32,7 @@ use crate::ty::{
#[derive(Copy, Clone, Debug)]
pub struct Discr<'tcx> {
/// Bit representation of the discriminant (e.g., `-128i8` is `0xFF_u128`).
/// Bit representation of the discriminant (e.g., `-1i8` is `0xFF_u128`).
pub val: u128,
pub ty: Ty<'tcx>,
}