bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
Instead we generate a discriminant rvalue and cast the result of that.
This commit is contained in:
Oli Scherer 2022-06-29 14:18:55 +00:00
parent 0e674b3ec5
commit 7839cb963f
15 changed files with 221 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_codegen_cranelift/src/base.rs
View file

@ -635,29 +635,6 @@ fn codegen_stmt<'tcx>(
let (ptr, _extra) = operand.load_scalar_pair(fx);
lval.write_cvalue(fx, CValue::by_val(ptr, dest_layout))
}
} else if let ty::Adt(adt_def, _substs) = from_ty.kind() {
// enum -> discriminant value
assert!(adt_def.is_enum());
match to_ty.kind() {
ty::Uint(_) | ty::Int(_) => {}
_ => unreachable!("cast adt {} -> {}", from_ty, to_ty),
}
let to_clif_ty = fx.clif_type(to_ty).unwrap();
let discriminant = crate::discriminant::codegen_get_discriminant(
fx,
operand,
fx.layout_of(operand.layout().ty.discriminant_ty(fx.tcx)),
)
.load_scalar(fx);
let res = crate::cast::clif_intcast(
fx,
discriminant,
to_clif_ty,
to_ty.is_signed(),
);
lval.write_cvalue(fx, CValue::by_val(res, dest_layout));
} else {
let to_clif_ty = fx.clif_type(to_ty).unwrap();
let from = operand.load_scalar(fx);