From 13ab08d7dc353d1d30ad055eea4c7ec4e5310237 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Sat, 9 Nov 2024 03:54:08 +0000
Subject: [PATCH] Do not reveal opaques in the param-env, we got lazy norm
instead
---
compiler/rustc_middle/src/ty/mod.rs | 11 ++++++-----
compiler/rustc_middle/src/ty/util.rs | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/compiler/rustc_middle/src/ty/mod.rs b/compiler/rustc_middle/src/ty/mod.rs
index 6d9ba3d60e3a4..1a3128ed936ab 100644
--- a/compiler/rustc_middle/src/ty/mod.rs
+++ b/compiler/rustc_middle/src/ty/mod.rs
@@ -1076,11 +1076,6 @@ impl<'tcx> ParamEnv<'tcx> {
ty::ParamEnv { packed: CopyTaggedPtr::new(caller_bounds, ParamTag { reveal }) }
}
- pub fn with_user_facing(mut self) -> Self {
- self.packed.set_tag(ParamTag { reveal: Reveal::UserFacing, ..self.packed.tag() });
- self
- }
-
/// Returns a new parameter environment with the same clauses, but
/// which "reveals" the true results of projections in all cases
/// (even for associated types that are specializable). This is
@@ -1095,6 +1090,12 @@ impl<'tcx> ParamEnv<'tcx> {
return self;
}
+ // No need to reveal opaques with the new solver enabled,
+ // since we have lazy norm.
+ if tcx.next_trait_solver_globally() {
+ return ParamEnv::new(self.caller_bounds(), Reveal::All);
+ }
+
ParamEnv::new(tcx.reveal_opaque_types_in_bounds(self.caller_bounds()), Reveal::All)
}
diff --git a/compiler/rustc_middle/src/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs
index fc5a3b762e5fd..3c6e34160f445 100644
--- a/compiler/rustc_middle/src/ty/util.rs
+++ b/compiler/rustc_middle/src/ty/util.rs
@@ -1751,6 +1751,7 @@ pub fn reveal_opaque_types_in_bounds<'tcx>(
tcx: TyCtxt<'tcx>,
val: ty::Clauses<'tcx>,
) -> ty::Clauses<'tcx> {
+ assert!(!tcx.next_trait_solver_globally());
let mut visitor = OpaqueTypeExpander {
seen_opaque_tys: FxHashSet::default(),
expanded_cache: FxHashMap::default(),