Only instantiate impl args

Author: compiler-errors

compiler/rustc_trait_selection/src/solve/inspect/analyse.rs

@@ -50,7 +50,7 @@ pub struct InspectGoal<'a, 'tcx> {
 /// not something we want to leak to users. We therefore
 /// treat `NormalizesTo` goals as if they apply the expected
 /// type at the end of each candidate.
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug)]
 struct NormalizesToTermHack<'tcx> {
     term: ty::Term<'tcx>,
     unconstrained_term: ty::Term<'tcx>,
@@ -197,6 +197,50 @@ impl<'a, 'tcx> InspectCandidate<'a, 'tcx> {
         (goals, opt_impl_args)
     }
 
+    /// Instantiate the args of an impl if this candidate came from a
+    /// `CandidateSource::Impl`. This function modifies the state of the
+    /// `infcx`.
+    #[instrument(
+        level = "debug",
+        skip_all,
+        fields(goal = ?self.goal.goal, steps = ?self.steps)
+    )]
+    pub fn instantiate_opt_impl_args(&self, span: Span) -> Option<ty::GenericArgsRef<'tcx>> {
+        let infcx = self.goal.infcx;
+        let param_env = self.goal.goal.param_env;
+        let mut orig_values = self.goal.orig_values.to_vec();
+
+        let mut opt_impl_args = None;
+        for step in &self.steps {
+            match **step {
+                inspect::ProbeStep::RecordImplArgs { impl_args } => {
+                    opt_impl_args = Some(instantiate_canonical_state(
+                        infcx,
+                        span,
+                        param_env,
+                        &mut orig_values,
+                        impl_args,
+                    ));
+                }
+                inspect::ProbeStep::AddGoal(..) => {}
+                inspect::ProbeStep::MakeCanonicalResponse { .. }
+                | inspect::ProbeStep::NestedProbe(_) => unreachable!(),
+            }
+        }
+
+        let () =
+            instantiate_canonical_state(infcx, span, param_env, &mut orig_values, self.final_state);
+
+        if let Some(term_hack) = self.goal.normalizes_to_term_hack {
+            // FIXME: We ignore the expected term of `NormalizesTo` goals
+            // when computing the result of its candidates. This is
+            // scuffed.
+            let _ = term_hack.constrain(infcx, span, param_env);
+        }
+
+        opt_impl_args.map(|impl_args| eager_resolve_vars(infcx, impl_args))
+    }
+
     pub fn instantiate_proof_tree_for_nested_goal(
         &self,
         source: GoalSource,

compiler/rustc_trait_selection/src/solve/select.rs

@@ -10,7 +10,6 @@ use rustc_infer::traits::{
 use rustc_macros::extension;
 use rustc_middle::{bug, span_bug};
 use rustc_span::Span;
-use thin_vec::ThinVec;
 
 use crate::solve::inspect::{self, ProofTreeInferCtxtExt};
 
@@ -147,8 +146,11 @@ fn to_selection<'tcx>(
         return None;
     }
 
-    let (nested, impl_args) = cand.instantiate_nested_goals_and_opt_impl_args(span);
-    let mut nested: ThinVec<_> = nested
+    let (nested, impl_args) = match cand.result().expect("expected positive result") {
+        Certainty::Yes => (vec![], cand.instantiate_opt_impl_args(span)),
+        Certainty::Maybe(_) => cand.instantiate_nested_goals_and_opt_impl_args(span),
+    };
+    let nested = nested
         .into_iter()
         .map(|nested| {
             Obligation::new(
@@ -160,10 +162,6 @@ fn to_selection<'tcx>(
         })
         .collect();
 
-    if let Ok(Certainty::Yes) = cand.result() {
-        nested.clear();
-    }
-
     Some(match cand.kind() {
         ProbeKind::TraitCandidate { source, result: _ } => match source {
             CandidateSource::Impl(impl_def_id) => {