bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

AbstractConst::root: Always run subst when Node is Leaf

Browse source
This commit is contained in:
Ethan Brierley 2021-09-04 15:44:26 +01:00
parent 72a51c39c6
commit 85d6029c13
3 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_privacy/src/lib.rs
View file

@ -23,7 +23,7 @@ use rustc_middle::mir::abstract_const::Node as ACNode;
use rustc_middle::span_bug; use rustc_middle::span_bug;
use rustc_middle::ty::fold::TypeVisitor; use rustc_middle::ty::fold::TypeVisitor;
use rustc_middle::ty::query::Providers; use rustc_middle::ty::query::Providers;
use rustc_middle::ty::subst::{InternalSubsts, Subst}; use rustc_middle::ty::subst::InternalSubsts;
use rustc_middle::ty::{self, Const, GenericParamDefKind, TraitRef, Ty, TyCtxt, TypeFoldable}; use rustc_middle::ty::{self, Const, GenericParamDefKind, TraitRef, Ty, TyCtxt, TypeFoldable};
use rustc_session::lint; use rustc_session::lint;
use rustc_span::hygiene::Transparency; use rustc_span::hygiene::Transparency;
@ -153,11 +153,8 @@ where
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
ct: AbstractConst<'tcx>, ct: AbstractConst<'tcx>,
) -> ControlFlow<V::BreakTy> { ) -> ControlFlow<V::BreakTy> {
const_evaluatable::walk_abstract_const(tcx, ct, |node| match node.root() { const_evaluatable::walk_abstract_const(tcx, ct, |node| match node.root(tcx, ct.substs) {
ACNode::Leaf(leaf) => { ACNode::Leaf(leaf) => self.visit_const(leaf),
let leaf = leaf.subst(tcx, ct.substs);
self.visit_const(leaf)
}
ACNode::Cast(_, _, ty) => self.visit_ty(ty), ACNode::Cast(_, _, ty) => self.visit_ty(ty),
ACNode::Binop(..) | ACNode::UnaryOp(..) | ACNode::FunctionCall(_, _) => { ACNode::Binop(..) | ACNode::UnaryOp(..) | ACNode::FunctionCall(_, _) => {
ControlFlow::CONTINUE ControlFlow::CONTINUE

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

@ -8,6 +8,7 @@
//! In this case we try to build an abstract representation of this constant using //! In this case we try to build an abstract representation of this constant using
//! `mir_abstract_const` which can then be checked for structural equality with other //! `mir_abstract_const` which can then be checked for structural equality with other
//! generic constants mentioned in the `caller_bounds` of the current environment. //! generic constants mentioned in the `caller_bounds` of the current environment.
use crate::traits::ty::subst::GenericArg;
use rustc_errors::ErrorReported; use rustc_errors::ErrorReported;
use rustc_hir::def::DefKind; use rustc_hir::def::DefKind;
use rustc_index::bit_set::BitSet; use rustc_index::bit_set::BitSet;
@ -80,9 +81,8 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
Concrete, Concrete,
} }
let mut failure_kind = FailureKind::Concrete; let mut failure_kind = FailureKind::Concrete;
walk_abstract_const::<!, _>(tcx, ct, |node| match node.root() { walk_abstract_const::<!, _>(tcx, ct, |node| match node.root(tcx, ct.substs) {
Node::Leaf(leaf) => { Node::Leaf(leaf) => {
let leaf = leaf.subst(tcx, ct.substs);
if leaf.has_infer_types_or_consts() { if leaf.has_infer_types_or_consts() {
failure_kind = FailureKind::MentionsInfer; failure_kind = FailureKind::MentionsInfer;
} else if leaf.definitely_has_param_types_or_consts(tcx) { } else if leaf.definitely_has_param_types_or_consts(tcx) {
@ -92,7 +92,6 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
ControlFlow::CONTINUE ControlFlow::CONTINUE
} }
Node::Cast(_, _, ty) => { Node::Cast(_, _, ty) => {
let ty = ty.subst(tcx, ct.substs);
if ty.has_infer_types_or_consts() { if ty.has_infer_types_or_consts() {
failure_kind = FailureKind::MentionsInfer; failure_kind = FailureKind::MentionsInfer;
} else if ty.definitely_has_param_types_or_consts(tcx) { } else if ty.definitely_has_param_types_or_consts(tcx) {
@ -218,8 +217,12 @@ impl<'tcx> AbstractConst<'tcx> {
} }
#[inline] #[inline]
pub fn root(self) -> Node<'tcx> { pub fn root(self, tcx: TyCtxt<'tcx>, substs: &[GenericArg<'tcx>]) -> Node<'tcx> {
self.inner.last().copied().unwrap() let mut node = self.inner.last().copied().unwrap();
if let Node::Leaf(leaf) = node {
node = Node::Leaf(leaf.subst(tcx, substs));
}
node
} }
} }
@ -587,7 +590,7 @@ where
f: &mut dyn FnMut(AbstractConst<'tcx>) -> ControlFlow<R>, f: &mut dyn FnMut(AbstractConst<'tcx>) -> ControlFlow<R>,
) -> ControlFlow<R> { ) -> ControlFlow<R> {
f(ct)?; f(ct)?;
let root = ct.root(); let root = ct.root(tcx, ct.substs);
match root { match root {
Node::Leaf(_) => ControlFlow::CONTINUE, Node::Leaf(_) => ControlFlow::CONTINUE,
Node::Binop(_, l, r) => { Node::Binop(_, l, r) => {
@ -615,16 +618,14 @@ pub(super) fn try_unify<'tcx>(
// We substitute generics repeatedly to allow AbstractConsts to unify where a // We substitute generics repeatedly to allow AbstractConsts to unify where a
// ConstKind::Unevalated could be turned into an AbstractConst that would unify e.g. // ConstKind::Unevalated could be turned into an AbstractConst that would unify e.g.
// Param(N) should unify with Param(T), substs: [Unevaluated("T2", [Unevaluated("T3", [Param(N)])])] // Param(N) should unify with Param(T), substs: [Unevaluated("T2", [Unevaluated("T3", [Param(N)])])]
while let Node::Leaf(a_ct) = a.root() { while let Node::Leaf(a_ct) = a.root(tcx, a.substs) {
let a_ct = a_ct.subst(tcx, a.substs);
match AbstractConst::from_const(tcx, a_ct) { match AbstractConst::from_const(tcx, a_ct) {
Ok(Some(a_act)) => a = a_act, Ok(Some(a_act)) => a = a_act,
Ok(None) => break, Ok(None) => break,
Err(_) => return true, Err(_) => return true,
} }
} }
while let Node::Leaf(b_ct) = b.root() { while let Node::Leaf(b_ct) = b.root(tcx, b.substs) {
let b_ct = b_ct.subst(tcx, b.substs);
match AbstractConst::from_const(tcx, b_ct) { match AbstractConst::from_const(tcx, b_ct) {
Ok(Some(b_act)) => b = b_act, Ok(Some(b_act)) => b = b_act,
Ok(None) => break, Ok(None) => break,
@ -632,10 +633,8 @@ pub(super) fn try_unify<'tcx>(
} }
} }
match (a.root(), b.root()) { match (a.root(tcx, a.substs), b.root(tcx, b.substs)) {
(Node::Leaf(a_ct), Node::Leaf(b_ct)) => { (Node::Leaf(a_ct), Node::Leaf(b_ct)) => {
let a_ct = a_ct.subst(tcx, a.substs);
let b_ct = b_ct.subst(tcx, b.substs);
if a_ct.ty != b_ct.ty { if a_ct.ty != b_ct.ty {
return false; return false;
} }

18
compiler/rustc_trait_selection/src/traits/object_safety.rs
View file

@ -838,14 +838,16 @@ fn contains_illegal_self_type_reference<'tcx, T: TypeFoldable<'tcx>>(
// constants which are not considered const evaluatable. // constants which are not considered const evaluatable.
use rustc_middle::mir::abstract_const::Node; use rustc_middle::mir::abstract_const::Node;
if let Ok(Some(ct)) = AbstractConst::new(self.tcx, uv.shrink()) { if let Ok(Some(ct)) = AbstractConst::new(self.tcx, uv.shrink()) {
const_evaluatable::walk_abstract_const(self.tcx, ct, |node| match node.root() { const_evaluatable::walk_abstract_const(self.tcx, ct, |node| {
Node::Leaf(leaf) => { match node.root(self.tcx, ct.substs) {
let leaf = leaf.subst(self.tcx, ct.substs); Node::Leaf(leaf) => {
self.visit_const(leaf) // let leaf = leaf.subst(self.tcx, ct.substs);
} self.visit_const(leaf)
Node::Cast(_, _, ty) => self.visit_ty(ty), }
Node::Binop(..) | Node::UnaryOp(..) | Node::FunctionCall(_, _) => { Node::Cast(_, _, ty) => self.visit_ty(ty),
ControlFlow::CONTINUE Node::Binop(..) | Node::UnaryOp(..) | Node::FunctionCall(_, _) => {
ControlFlow::CONTINUE
}
} }
}) })
} else { } else {