mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/ConstantSource/ConstantKind/

Browse Source
This commit is contained in:
Oli Scherer 2021-03-15 11:23:44 +00:00
parent 6b1dd82162
commit 21a0c8e9e4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/constant.rs
View File

@ -40,8 +40,8 @@ pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool {
let mut all_constants_ok = true; let mut all_constants_ok = true;
for constant in &fx.mir.required_consts { for constant in &fx.mir.required_consts {
let const_ = match fx.monomorphize(constant.literal) { let const_ = match fx.monomorphize(constant.literal) {
ConstantSource::Ty(ct) => ct, ConstantKind::Ty(ct) => ct,
ConstantSource::Val(..) => continue, ConstantKind::Val(..) => continue,
}; };
match const_.val { match const_.val {
ConstKind::Value(_) => {} ConstKind::Value(_) => {}
@ -117,8 +117,8 @@ pub(crate) fn codegen_constant<'tcx>(
constant: &Constant<'tcx>, constant: &Constant<'tcx>,
) -> CValue<'tcx> { ) -> CValue<'tcx> {
let const_ = match fx.monomorphize(constant.literal) { let const_ = match fx.monomorphize(constant.literal) {
ConstantSource::Ty(ct) => ct, ConstantKind::Ty(ct) => ct,
ConstantSource::Val(val, ty) => return codegen_const_value(fx, val, ty), ConstantKind::Val(val, ty) => return codegen_const_value(fx, val, ty),
}; };
let const_val = match const_.val { let const_val = match const_.val {
ConstKind::Value(const_val) => const_val, ConstKind::Value(const_val) => const_val,
@ -427,10 +427,10 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
match operand { match operand {
Operand::Copy(_) | Operand::Move(_) => None, Operand::Copy(_) | Operand::Move(_) => None,
Operand::Constant(const_) => match const_.literal { Operand::Constant(const_) => match const_.literal {
ConstantSource::Ty(const_) => { ConstantKind::Ty(const_) => {
fx.monomorphize(const_).eval(fx.tcx, ParamEnv::reveal_all()).val.try_to_value() fx.monomorphize(const_).eval(fx.tcx, ParamEnv::reveal_all()).val.try_to_value()
} }
ConstantSource::Val(val, _) => Some(val), ConstantKind::Val(val, _) => Some(val),
}, },
} }
} }