Skip to content

Commit c663ebd

Browse files
authored
Rollup merge of #117441 - cjgillot:diag-noassert, r=oli-obk,RalfJung
Do not assert in op_to_const. `op_to_const` is used in `try_destructure_mir_constant_for_diagnostics`, which may encounter invalid constants created by optimizations and debugging. r? ``@oli-obk`` Fixes rust-lang/rust#117368
2 parents 19a43c9 + d7580f1 commit c663ebd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_utils/src/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ fn field_of_struct<'tcx>(
710710
field: &Ident,
711711
) -> Option<mir::Const<'tcx>> {
712712
if let mir::Const::Val(result, ty) = result
713-
&& let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_diagnostics(result, ty)
713+
&& let Some(dc) = lcx.tcx.try_destructure_mir_constant_for_user_output(result, ty)
714714
&& let Some(dc_variant) = dc.variant
715715
&& let Some(variant) = adt_def.variants().get(dc_variant)
716716
&& let Some(field_idx) = variant.fields.iter().position(|el| el.name == field.name)

0 commit comments

Comments
 (0)