bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use AllocId and Ty in ExprKind::StaticRef and delay ConstValue construction

Browse source
This commit is contained in:
b-naber 2022-02-09 16:18:57 +01:00
parent 54ff25e446
commit fff06e5edc
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
//! See docs in build/expr/mod.rs
use crate::build::Builder;
use rustc_middle::mir::interpret::{ConstValue, Scalar};
use rustc_middle::mir::*;
use rustc_middle::thir::*;
use rustc_middle::ty::CanonicalUserTypeAnnotation;
@ -26,11 +27,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
assert_eq!(literal.ty(), ty);
Constant { span, user_ty, literal: literal.into() }
}
ExprKind::StaticRef { literal, .. } => {
let const_val = literal.val.try_to_value().unwrap_or_else(|| {
bug!("expected `ConstKind::Value`, but found {:?}", literal.val)
});
let literal = ConstantKind::Val(const_val, literal.ty);
ExprKind::StaticRef { alloc_id, ty, .. } => {
let const_val =
ConstValue::Scalar(Scalar::from_pointer(alloc_id.into(), &this.tcx));
let literal = ConstantKind::Val(const_val, ty);
Constant { span, user_ty: None, literal }
}