Be better at enforcing that const_conditions is only called on const items

1 files changed, 7 insertions, 6 deletions

diff --git a/compiler/rustc_ty_utils/src/ty.rs b/compiler/rustc_ty_utils/src/ty.rs
index ac2708a29f4..aa499995bcb 100644
--- a/compiler/rustc_ty_utils/src/ty.rs
+++ b/compiler/rustc_ty_utils/src/ty.rs
@@ -152,12 +152,13 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
 
     // We extend the param-env of our item with the const conditions of the item,
     // since we're allowed to assume `~const` bounds hold within the item itself.
-    predicates.extend(
-        tcx.const_conditions(def_id)
-            .instantiate_identity(tcx)
-            .into_iter()
-            .map(|(trait_ref, _)| trait_ref.to_host_effect_clause(tcx, ty::HostPolarity::Maybe)),
-    );
+    if tcx.is_conditionally_const(def_id) {
+        predicates.extend(
+            tcx.const_conditions(def_id).instantiate_identity(tcx).into_iter().map(
+                |(trait_ref, _)| trait_ref.to_host_effect_clause(tcx, ty::HostPolarity::Maybe),
+            ),
+        );
+    }
 
     let local_did = def_id.as_local();