bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cranelift changes

Browse source
This commit is contained in:
b-naber 2022-06-30 16:54:10 +02:00
parent a7735cd329
commit 0726265442
1 changed files with 59 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

108
compiler/rustc_codegen_cranelift/src/constant.rs
View file

@ -41,36 +41,30 @@ impl ConstantCx {
pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool { 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 unevaluated = match fx.monomorphize(constant.literal) {
ConstantKind::Ty(ct) => ct, ConstantKind::Ty(ct) => match ct.kind() {
ConstKind::Unevaluated(uv) => uv.expand(),
ConstKind::Value(_) => continue,
ConstKind::Param(_)
| ConstKind::Infer(_)
| ConstKind::Bound(_, _)
| ConstKind::Placeholder(_)
| ConstKind::Error(_) => unreachable!("{:?}", ct),
},
ConstantKind::Unevaluated(uv, _) => uv,
ConstantKind::Val(..) => continue, ConstantKind::Val(..) => continue,
}; };
match const_.kind() {
ConstKind::Value(_) => {} if let Err(err) = fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None) {
ConstKind::Unevaluated(unevaluated) => { all_constants_ok = false;
if let Err(err) = match err {
fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None) ErrorHandled::Reported(_) | ErrorHandled::Linted => {
{ fx.tcx.sess.span_err(constant.span, "erroneous constant encountered");
all_constants_ok = false; }
match err { ErrorHandled::TooGeneric => {
ErrorHandled::Reported(_) | ErrorHandled::Linted => { span_bug!(constant.span, "codegen encountered polymorphic constant: {:?}", err);
fx.tcx.sess.span_err(constant.span, "erroneous constant encountered");
}
ErrorHandled::TooGeneric => {
span_bug!(
constant.span,
"codegen encountered polymorphic constant: {:?}",
err
);
}
}
} }
} }
ConstKind::Param(_)
| ConstKind::Infer(_)
| ConstKind::Bound(_, _)
| ConstKind::Placeholder(_)
| ConstKind::Error(_) => unreachable!("{:?}", const_),
} }
} }
all_constants_ok all_constants_ok
@ -122,43 +116,56 @@ pub(crate) fn codegen_constant<'tcx>(
fx: &mut FunctionCx<'_, '_, 'tcx>, fx: &mut FunctionCx<'_, '_, 'tcx>,
constant: &Constant<'tcx>, constant: &Constant<'tcx>,
) -> CValue<'tcx> { ) -> CValue<'tcx> {
let const_ = match fx.monomorphize(constant.literal) { let (const_val, ty) = match fx.monomorphize(constant.literal) {
ConstantKind::Ty(ct) => ct, ConstantKind::Ty(const_) => match const_.kind() {
ConstantKind::Unevaluated(mir::Unevaluated { def, substs, promoted }) 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::Param(_)
| ConstKind::Infer(_)
| ConstKind::Bound(_, _)
| ConstKind::Placeholder(_)
| ConstKind::Error(_) => unreachable!("{:?}", const_),
},
ConstantKind::Unevaluated(ty::Unevaluated { def, substs, promoted }, ty)
if fx.tcx.is_static(def.did) => if fx.tcx.is_static(def.did) =>
{ {
assert!(substs.is_empty()); assert!(substs.is_empty());
assert!(promoted.is_none()); assert!(promoted.is_none());
return codegen_static_ref(fx, def.did, fx.layout_of(const_.ty())).to_cvalue(fx); return codegen_static_ref(fx, def.did, fx.layout_of(ty)).to_cvalue(fx);
} }
ConstantKind::Unevaluated(unevaluated) => { ConstantKind::Unevaluated(unevaluated, ty) => {
match fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None) { match fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), unevaluated, None) {
Ok(const_val) => const_val, Ok(const_val) => (const_val, ty),
Err(_) => { Err(_) => {
span_bug!(constant.span, "erroneous constant not captured by required_consts"); span_bug!(constant.span, "erroneous constant not captured by required_consts");
} }
} }
} }
ConstantKind::Val(val, ty) => return codegen_const_value(fx, val, ty), ConstantKind::Val(val, ty) => (val, ty),
};
let const_val = match const_.kind() {
ConstKind::Value(valtree) => fx.tcx.valtree_to_const_val((const_.ty(), valtree)),
ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted })
if fx.tcx.is_static(def.did) =>
{
assert!(substs.is_empty());
assert!(promoted.is_none());
return codegen_static_ref(fx, def.did, fx.layout_of(const_.ty())).to_cvalue(fx);
}
ConstKind::Param(_)
| ConstKind::Infer(_)
| ConstKind::Bound(_, _)
| ConstKind::Placeholder(_)
| ConstKind::Error(_) => unreachable!("{:?}", const_),
}; };
codegen_const_value(fx, const_val, const_.ty()) codegen_const_value(fx, const_val, ty)
} }
pub(crate) fn codegen_const_value<'tcx>( pub(crate) fn codegen_const_value<'tcx>(
@ -503,6 +510,9 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
.eval_for_mir(fx.tcx, ParamEnv::reveal_all()) .eval_for_mir(fx.tcx, ParamEnv::reveal_all())
.try_to_value(fx.tcx), .try_to_value(fx.tcx),
ConstantKind::Val(val, _) => Some(val), ConstantKind::Val(val, _) => Some(val),
ConstantKind::Unevaluated(uv, _) => {
fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), uv, None).ok()
}
}, },
// FIXME(rust-lang/rust#85105): Casts like `IMM8 as u32` result in the const being stored // FIXME(rust-lang/rust#85105): Casts like `IMM8 as u32` result in the const being stored
// inside a temporary before being passed to the intrinsic requiring the const argument. // inside a temporary before being passed to the intrinsic requiring the const argument.