bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Give inline const separate DefKind

Browse source
This commit is contained in:
Gary Guo 2021-10-02 12:59:26 +01:00
parent 089a016919
commit 02c1774cd3
16 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View file

@ -151,7 +151,7 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
if concrete.is_ok() && uv.substs(infcx.tcx).definitely_has_param_types_or_consts(infcx.tcx) {
match infcx.tcx.def_kind(uv.def.did) {
DefKind::AnonConst => {
DefKind::AnonConst | DefKind::InlineConst => {
let mir_body = infcx.tcx.mir_for_ctfe_opt_const_arg(uv.def);
if mir_body.is_polymorphic {
@ -495,7 +495,7 @@ pub(super) fn thir_abstract_const<'tcx>(
// we want to look into them or treat them as opaque projections.
//
// Right now we do neither of that and simply always fail to unify them.
DefKind::AnonConst => (),
DefKind::AnonConst | DefKind::InlineConst => (),
_ => return Ok(None),
}