Bubble anchor out of fully_solve_obligation

Author: oli-obk

compiler/rustc_hir_analysis/src/coherence/builtin.rs

@@ -576,7 +576,7 @@ pub fn coerce_unsized_info<'tcx>(tcx: TyCtxt<'tcx>, impl_did: DefId) -> CoerceUn
     let cause = traits::ObligationCause::misc(span, impl_did);
     let predicate =
         predicate_for_trait_def(tcx, param_env, cause, trait_def_id, 0, [source, target]);
-    let errors = traits::fully_solve_obligation(&infcx, predicate);
+    let errors = traits::fully_solve_obligation(&infcx, predicate, infer::DefiningAnchor::Error);
     if !errors.is_empty() {
         infcx.err_ctxt().report_fulfillment_errors(&errors, None);
     }

compiler/rustc_hir_analysis/src/hir_wf_check.rs

@@ -80,6 +80,7 @@ fn diagnostic_hir_wf_check<'tcx>(
                     self.param_env,
                     ty::Binder::dummy(ty::PredicateKind::WellFormed(tcx_ty.into())),
                 ),
+                rustc_infer::infer::DefiningAnchor::Error,
             );
             if !errors.is_empty() {
                 debug!("Wf-check got errors for {:?}: {:?}", ty, errors);

compiler/rustc_hir_typeck/src/op.rs

@@ -775,7 +775,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             (None, Some(trait_did)) => {
                 let (obligation, _) =
                     self.obligation_for_method(cause, trait_did, lhs_ty, Some(input_types));
-                Err(rustc_trait_selection::traits::fully_solve_obligation(self, obligation))
+                Err(rustc_trait_selection::traits::fully_solve_obligation(
+                    self,
+                    obligation,
+                    self.defining_use_anchor,
+                ))
             }
         }
     }

compiler/rustc_trait_selection/src/traits/coherence.rs

@@ -376,7 +376,7 @@ fn resolve_negative_obligation<'tcx>(
     };
 
     let param_env = o.param_env;
-    if !super::fully_solve_obligation(&infcx, o).is_empty() {
+    if !super::fully_solve_obligation(&infcx, o, infcx.old_defining_use_anchor).is_empty() {
         return false;
     }
 

compiler/rustc_trait_selection/src/traits/mod.rs

@@ -170,7 +170,7 @@ fn pred_known_to_hold_modulo_regions<'tcx>(
         // The handling of regions in this area of the code is terrible,
         // see issue #29149. We should be able to improve on this with
         // NLL.
-        let errors = fully_solve_obligation(infcx, obligation);
+        let errors = fully_solve_obligation(infcx, obligation, infcx.old_defining_use_anchor);
 
         match &errors[..] {
             [] => true,
@@ -393,8 +393,9 @@ where
 pub fn fully_solve_obligation<'tcx>(
     infcx: &InferCtxt<'tcx>,
     obligation: PredicateObligation<'tcx>,
+    defining_use_anchor: DefiningAnchor,
 ) -> Vec<FulfillmentError<'tcx>> {
-    fully_solve_obligations(infcx, [obligation], infcx.old_defining_use_anchor)
+    fully_solve_obligations(infcx, [obligation], defining_use_anchor)
 }
 
 /// Process a set of obligations (and any nested obligations that come from them)
@@ -423,7 +424,7 @@ pub fn fully_solve_bound<'tcx>(
     let trait_ref = tcx.mk_trait_ref(bound, [ty]);
     let obligation = Obligation::new(tcx, cause, param_env, ty::Binder::dummy(trait_ref));
 
-    fully_solve_obligation(infcx, obligation)
+    fully_solve_obligation(infcx, obligation, infcx.old_defining_use_anchor)
 }
 
 /// Normalizes the predicates and checks whether they hold in an empty environment. If this