From 846eecb1a40210b287b92ea1750aedcf478067ae Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Wed, 29 Jun 2022 14:18:55 +0000
Subject: [PATCH] Change enum->int casts to not go through MIR casts.
Instead we generate a discriminant rvalue and cast the result of that.
---
src/base.rs | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/src/base.rs b/src/base.rs
index fbe830b2b10..a07ed405aa4 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -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);