bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make sure to use normalized ty for unevaluated const for default struct value

Browse source
This commit is contained in:
Michael Goulet 2024-12-14 18:04:09 +00:00
parent ad30caebdd
commit f870761cd8
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_mir_build/src/build/expr/into.rs
View file

@ -367,14 +367,20 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
.collect()
}
AdtExprBase::DefaultFields(field_types) => {
itertools::zip_eq(field_names, &**field_types)
.map(|(n, ty)| match fields_map.get(&n) {
itertools::zip_eq(field_names, field_types)
.map(|(n, &ty)| match fields_map.get(&n) {
Some(v) => v.clone(),
None => match variant.fields[n].value {
Some(def) => {
let value = Const::from_unevaluated(this.tcx, def)
.instantiate(this.tcx, args);
this.literal_operand(expr_span, value)
let value = Const::Unevaluated(
UnevaluatedConst::new(def, args),
ty,
);
Operand::Constant(Box::new(ConstOperand {
span: expr_span,
user_ty: None,
const_: value,
}))
}
None => {
let name = variant.fields[n].name;