bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prepare mir::Constant for ty::Const only supporting valtrees

Browse source
This commit is contained in:
Oli Scherer 2021-03-08 16:18:03 +00:00
parent 3ecde6f5db
commit 3127a9c60f
38 changed files with 369 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_mir_build/src/build/expr/as_constant.rs
View file

@ -11,7 +11,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
crate fn as_constant(&mut self, expr: &Expr<'_, 'tcx>) -> Constant<'tcx> {
let this = self;
let Expr { ty, temp_lifetime: _, span, ref kind } = *expr;
match kind {
match *kind {
ExprKind::Scope { region_scope: _, lint_level: _, value } => this.as_constant(value),
ExprKind::Literal { literal, user_ty, const_id: _ } => {
let user_ty = user_ty.map(|user_ty| {
@ -22,11 +22,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
})
});
assert_eq!(literal.ty, ty);
Constant { span, user_ty, literal }
Constant { span, user_ty, literal: literal.into() }
}
ExprKind::StaticRef { literal, .. } => Constant { span, user_ty: None, literal },
ExprKind::StaticRef { literal, .. } => Constant { span, user_ty: None, literal: literal.into() },
ExprKind::ConstBlock { value } => {
Constant { span: span, user_ty: None, literal: value }
Constant { span: span, user_ty: None, literal: value.into() }
}
_ => span_bug!(span, "expression is not a valid constant {:?}", kind),
}