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

address review again

Browse Source
This commit is contained in:
b-naber 2022-09-14 15:35:24 +02:00
parent fa35afe8dc
commit a10dd1f340
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/constant.rs
View File

@ -121,25 +121,7 @@ pub(crate) fn codegen_constant<'tcx>(
ConstKind::Value(valtree) => {
(fx.tcx.valtree_to_const_val((const_.ty(), valtree)), const_.ty())
}
ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted })
if fx.tcx.is_static(def.did) =>
{
assert!(substs.is_empty());
assert_eq!(promoted, ());
return codegen_static_ref(fx, def.did, fx.layout_of(const_.ty())).to_cvalue(fx);
}
ConstKind::Unevaluated(unevaluated) => {
match fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated.expand(), None)
{
Ok(const_val) => (const_val, const_.ty()),
Err(_) => {
span_bug!(
constant.span,
"erroneous constant not captured by required_consts"
);
}
}
}
ConstKind::Unevaluated(_) => bug!("expected constant to be evaluated at this stage"),
ConstKind::Param(_)
| ConstKind::Infer(_)
| ConstKind::Bound(_, _)