From 3ec5042cf944cfb242408e45166e7da79eaf0692 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Thu, 22 Feb 2024 09:35:33 +0000
Subject: [PATCH] Avoid computing generic params or a param env for free const
items
---
compiler/rustc_hir_analysis/src/lib.rs | 10 ++++++++--
tests/ui/generic-const-items/hkl_where_bounds.rs | 14 ++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 tests/ui/generic-const-items/hkl_where_bounds.rs
diff --git a/compiler/rustc_hir_analysis/src/lib.rs b/compiler/rustc_hir_analysis/src/lib.rs
index 19ab2045cc5..ffebaaa24b6 100644
--- a/compiler/rustc_hir_analysis/src/lib.rs
+++ b/compiler/rustc_hir_analysis/src/lib.rs
@@ -102,8 +102,9 @@ use rustc_errors::ErrorGuaranteed;
use rustc_hir as hir;
use rustc_hir::def::DefKind;
use rustc_middle::middle;
+use rustc_middle::mir::interpret::GlobalId;
use rustc_middle::query::Providers;
-use rustc_middle::ty::{Ty, TyCtxt};
+use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_middle::util;
use rustc_session::parse::feature_err;
use rustc_span::{symbol::sym, Span};
@@ -187,7 +188,12 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
let def_kind = tcx.def_kind(item_def_id);
match def_kind {
DefKind::Static { .. } => tcx.ensure().eval_static_initializer(item_def_id),
- DefKind::Const => tcx.ensure().const_eval_poly(item_def_id.into()),
+ DefKind::Const if tcx.generics_of(item_def_id).params.is_empty() => {
+ let instance = ty::Instance::new(item_def_id.into(), ty::GenericArgs::empty());
+ let cid = GlobalId { instance, promoted: None };
+ let param_env = ty::ParamEnv::reveal_all();
+ tcx.ensure().eval_to_const_value_raw(param_env.and(cid));
+ }
_ => (),
}
});
diff --git a/tests/ui/generic-const-items/hkl_where_bounds.rs b/tests/ui/generic-const-items/hkl_where_bounds.rs
new file mode 100644
index 00000000000..cded518312a
--- /dev/null
+++ b/tests/ui/generic-const-items/hkl_where_bounds.rs
@@ -0,0 +1,14 @@
+//! Test that nonsense bounds prevent consts from being evaluated at all.
+//@ check-pass
+
+#![feature(generic_const_items)]
+#![allow(incomplete_features)]
+trait Trait {
+ const ASSOC: u32;
+}
+
+// rustfmt eats the where bound
+#[rustfmt::skip]
+const ASSOC: u32 = <&'static ()>::ASSOC where for<'a> &'a (): Trait;
+
+fn main() {}