Bubble defining use anchor out of fully_solve_obligations

Author: oli-obk

compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs

@@ -184,7 +184,12 @@ impl Qualif for NeedsNonConstDrop {
         }
 
         // If we had any errors, then it's bad
-        !traits::fully_solve_obligations(&infcx, impl_src.nested_obligations()).is_empty()
+        !traits::fully_solve_obligations(
+            &infcx,
+            impl_src.nested_obligations(),
+            rustc_infer::infer::DefiningAnchor::Error,
+        )
+        .is_empty()
     }
 
     fn in_adt_inherently<'tcx>(

compiler/rustc_hir_analysis/src/coherence/builtin.rs

@@ -335,6 +335,7 @@ fn visit_implementation_of_dispatch_from_dyn(tcx: TyCtxt<'_>, impl_did: LocalDef
                             [field.ty(tcx, substs_a), field.ty(tcx, substs_b)],
                         )
                     }),
+                    infer::DefiningAnchor::Error,
                 );
                 if !errors.is_empty() {
                     infcx.err_ctxt().report_fulfillment_errors(&errors, None);

compiler/rustc_hir_analysis/src/lib.rs

@@ -166,7 +166,11 @@ fn require_same_types<'tcx>(
     let infcx = &tcx.infer_ctxt().build();
     let param_env = ty::ParamEnv::empty();
     let errors = match infcx.at(cause, param_env).eq(expected, actual) {
-        Ok(InferOk { obligations, .. }) => traits::fully_solve_obligations(infcx, obligations),
+        Ok(InferOk { obligations, .. }) => traits::fully_solve_obligations(
+            infcx,
+            obligations,
+            rustc_infer::infer::DefiningAnchor::Error,
+        ),
         Err(err) => {
             infcx.err_ctxt().report_mismatched_types(cause, expected, actual, err).emit();
             return false;

compiler/rustc_trait_selection/src/traits/mod.rs

@@ -26,6 +26,7 @@ use crate::infer::{InferCtxt, TyCtxtInferExt};
 use crate::traits::error_reporting::TypeErrCtxtExt as _;
 use crate::traits::query::evaluate_obligation::InferCtxtExt as _;
 use rustc_errors::ErrorGuaranteed;
+use rustc_infer::infer::DefiningAnchor;
 use rustc_middle::ty::fold::TypeFoldable;
 use rustc_middle::ty::visit::{TypeVisitable, TypeVisitableExt};
 use rustc_middle::ty::{self, DefIdTree, ToPredicate, Ty, TyCtxt, TypeSuperVisitable};
@@ -393,16 +394,17 @@ pub fn fully_solve_obligation<'tcx>(
     infcx: &InferCtxt<'tcx>,
     obligation: PredicateObligation<'tcx>,
 ) -> Vec<FulfillmentError<'tcx>> {
-    fully_solve_obligations(infcx, [obligation])
+    fully_solve_obligations(infcx, [obligation], infcx.old_defining_use_anchor)
 }
 
 /// Process a set of obligations (and any nested obligations that come from them)
 /// to completion
 pub fn fully_solve_obligations<'tcx>(
     infcx: &InferCtxt<'tcx>,
     obligations: impl IntoIterator<Item = PredicateObligation<'tcx>>,
+    defining_use_anchor: DefiningAnchor,
 ) -> Vec<FulfillmentError<'tcx>> {
-    let ocx = ObligationCtxt::new(infcx).with_defining_use_anchor(infcx.old_defining_use_anchor);
+    let ocx = ObligationCtxt::new(infcx).with_defining_use_anchor(defining_use_anchor);
     ocx.register_obligations(obligations);
     ocx.select_all_or_error()
 }

compiler/rustc_trait_selection/src/traits/outlives_bounds.rs

@@ -83,6 +83,7 @@ impl<'a, 'tcx: 'a> InferCtxtExt<'a, 'tcx> for InferCtxt<'tcx> {
                         param_env,
                     )
                 }),
+                self.old_defining_use_anchor,
             );
             if !constraints.member_constraints.is_empty() {
                 span_bug!(span, "{:#?}", constraints.member_constraints);

compiler/rustc_trait_selection/src/traits/query/type_op/custom.rs

@@ -73,7 +73,7 @@ pub fn scrape_region_constraints<'tcx, Op: super::TypeOp<'tcx, Output = R>, R>(
     );
 
     let InferOk { value, obligations } = infcx.commit_if_ok(|_| op())?;
-    let errors = traits::fully_solve_obligations(infcx, obligations);
+    let errors = traits::fully_solve_obligations(infcx, obligations, infcx.old_defining_use_anchor);
     if !errors.is_empty() {
         infcx.tcx.sess.diagnostic().delay_span_bug(
             DUMMY_SP,