use abstract consts when unifying ConstKind::Unevaluated

2020-09-10 18:48:18 +02:00
parent d327fa112b
commit c3a772f55f
8 changed files with 96 additions and 10 deletions
--- a/compiler/rustc_middle/src/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
@@ -263,6 +263,16 @@ rustc_queries! {
            }
        }

+        query try_unify_abstract_consts(key: (
+            (ty::WithOptConstParam<DefId>, SubstsRef<'tcx>),
+            (ty::WithOptConstParam<DefId>, SubstsRef<'tcx>)
+        )) -> bool {
+            desc {
+                |tcx| "trying to unify the generic constants {} and {}",
+                tcx.def_path_str(key.0.0.did), tcx.def_path_str(key.1.0.did)
+            }
+        }
+
        query mir_drops_elaborated_and_const_checked(
            key: ty::WithOptConstParam<LocalDefId>
        ) -> &'tcx Steal<mir::Body<'tcx>> {