Prefer dedicated normalized param env query over manually normalizing

Author: oli-obk

compiler/rustc_middle/src/mir/interpret/queries.rs

@@ -23,7 +23,7 @@ impl<'tcx> TyCtxt<'tcx> {
         let args = GenericArgs::identity_for_item(self, def_id);
         let instance = ty::Instance::new(def_id, args);
         let cid = GlobalId { instance, promoted: None };
-        let param_env = self.param_env(def_id).with_reveal_all_normalized(self);
+        let param_env = self.param_env_reveal_all_normalized(def_id);
         self.const_eval_global_id(param_env, cid, None)
     }
     /// Resolves and evaluates a constant.
@@ -188,7 +188,7 @@ impl<'tcx> TyCtxtEnsure<'tcx> {
         let args = GenericArgs::identity_for_item(self.tcx, def_id);
         let instance = ty::Instance::new(def_id, args);
         let cid = GlobalId { instance, promoted: None };
-        let param_env = self.tcx.param_env(def_id).with_reveal_all_normalized(self.tcx);
+        let param_env = self.tcx.param_env_reveal_all_normalized(def_id);
         // Const-eval shouldn't depend on lifetimes at all, so we can erase them, which should
         // improve caching of queries.
         let inputs = self.tcx.erase_regions(param_env.and(cid));