rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use abstract consts when unifying ConstKind::Unevaluated

Browse Source
This commit is contained in:
Bastian Kauschke
2020-09-10 18:48:18 +02:00
parent d327fa112b
commit c3a772f55f
8 changed files with 96 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View File

@@ -269,7 +269,27 @@ pub(super) fn mir_abstract_const<'tcx>(
}
}
pub fn try_unify<'tcx>(tcx: TyCtxt<'tcx>, a: AbstractConst<'tcx>, b: AbstractConst<'tcx>) -> bool {
pub(super) fn try_unify_abstract_consts<'tcx>(
tcx: TyCtxt<'tcx>,
((a, a_substs), (b, b_substs)): (
(ty::WithOptConstParam<DefId>, SubstsRef<'tcx>),
(ty::WithOptConstParam<DefId>, SubstsRef<'tcx>),
),
) -> bool {
if let Some(a) = AbstractConst::new(tcx, a, a_substs) {
if let Some(b) = AbstractConst::new(tcx, b, b_substs) {
return try_unify(tcx, a, b);
}
}
false
}
pub(super) fn try_unify<'tcx>(
tcx: TyCtxt<'tcx>,
a: AbstractConst<'tcx>,
b: AbstractConst<'tcx>,
) -> bool {
match (a.root(), b.root()) {
(Node::Leaf(a_ct), Node::Leaf(b_ct)) => {
let a_ct = a_ct.subst(tcx, a.substs);