try to get rid of mir::Const::normalize

2024-09-28 21:15:18 +02:00
parent e6eb45143c
commit 921a5ef6d7
3 changed files with 3 additions and 19 deletions
--- a/compiler/rustc_mir_transform/src/jump_threading.rs
+++ b/compiler/rustc_mir_transform/src/jump_threading.rs
@@ -516,9 +516,7 @@ impl<'a, 'tcx> TOFinder<'a, 'tcx> {
                    // Avoid handling them, though this could be extended in the future.
                    return;
                }
-                let Some(value) =
-                    value.const_.normalize(self.tcx, self.param_env).try_to_scalar_int()
-                else {
+                let Some(value) = value.const_.try_eval_scalar_int(self.tcx, self.param_env) else {
                    return;
                };
                let conds = conditions.map(self.arena, |c| Condition {