Only consider predicate non-global if binder vars are in PREDICATE binder

Author: compiler-errors

compiler/rustc_hir_analysis/src/check/wfcheck.rs

@@ -2291,7 +2291,7 @@ impl<'tcx> WfCheckingCtxt<'_, 'tcx> {
                 continue;
             }
             // Match the existing behavior.
-            if pred.is_global() && !pred.has_type_flags(TypeFlags::HAS_BINDER_VARS) {
+            if pred.is_global() && pred.kind().bound_vars().is_empty() {
                 let pred = self.normalize(span, None, pred);
 
                 // only use the span of the predicate clause (#90869)

compiler/rustc_trait_selection/src/traits/select/mod.rs

@@ -1862,7 +1862,8 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
         //
         // Our handling of where-bounds is generally fairly messy but necessary for backwards
         // compatibility, see #50825 for why we need to handle global where-bounds like this.
-        let is_global = |c: ty::PolyTraitPredicate<'tcx>| c.is_global() && !c.has_bound_vars();
+        let is_global =
+            |c: ty::PolyTraitPredicate<'tcx>| c.is_global() && c.bound_vars().is_empty();
         let param_candidates = candidates
             .iter()
             .filter_map(|c| if let ParamCandidate(p) = c.candidate { Some(p) } else { None });