bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Support aggregate expressions

Browse source
This commit is contained in:
Andy Wang 2023-03-20 12:32:38 +01:00
parent ab9bb3ea36
commit 8e4e55e524
No known key found for this signature in database
GPG key ID: 181B49F9F38F3374
5 changed files with 137 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_mir_build/src/build/custom/parse/instruction.rs
View file

@ -166,6 +166,31 @@ impl<'tcx, 'body> ParseCtxt<'tcx, 'body> {
let cast_kind = mir_cast_kind(source_ty, expr.ty);
Ok(Rvalue::Cast(cast_kind, source, expr.ty))
},
ExprKind::Tuple { fields } => Ok(
Rvalue::Aggregate(
Box::new(AggregateKind::Tuple),
fields.iter().map(|e| self.parse_operand(*e)).collect::<Result<_, _>>()?
)
),
ExprKind::Array { fields } => {
let elem_ty = match expr.ty.kind() {
ty::Array(ty, ..) => ty,
_ => unreachable!("ty is array"),
};
Ok(Rvalue::Aggregate(
Box::new(AggregateKind::Array(*elem_ty)),
fields.iter().map(|e| self.parse_operand(*e)).collect::<Result<_, _>>()?
))
},
ExprKind::Adt(box AdtExpr{ adt_def, variant_index, substs, fields, .. }) => {
let is_union = adt_def.is_union();
let active_field_index = is_union.then(|| fields[0].name.index());
Ok(Rvalue::Aggregate(
Box::new(AggregateKind::Adt(adt_def.did(), *variant_index, substs, None, active_field_index)),
fields.iter().map(|f| self.parse_operand(f.expr)).collect::<Result<_, _>>()?
))
},
_ => self.parse_operand(expr_id).map(Rvalue::Use),
)
}