Do not assert in op_to_const.

2023-10-31 11:31:08 +00:00
parent 146dafa262
commit c2f49e9edf
2 changed files with 13 additions and 2 deletions
--- a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
+++ b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
@@ -132,8 +132,8 @@ pub(super) fn op_to_const<'tcx>(
        // functionality.)
        _ => false,
    };
-    let immediate = if force_as_immediate {
-        Right(ecx.read_immediate(op).expect("normalization works on validated constants"))
+    let immediate = if force_as_immediate && let Ok(imm) = ecx.read_immediate(op) {
+        Right(imm)
    } else {
        op.as_mplace_or_imm()
    };