Fix some things that were changed

Author: camelid

compiler/rustc_const_eval/src/check_consts/qualifs.rs

@@ -7,11 +7,11 @@
 
 use rustc_errors::ErrorGuaranteed;
 use rustc_hir::LangItem;
-use rustc_hir::def::DefKind;
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::mir::*;
 use rustc_middle::ty::{self, AdtDef, Ty};
 use rustc_middle::{bug, mir};
+use rustc_span::sym;
 use rustc_trait_selection::traits::{Obligation, ObligationCause, ObligationCtxt};
 use tracing::instrument;
 
@@ -371,7 +371,8 @@ where
         // FIXME(mgca): is this really the right behavior? should we return the qualifs of the anon const body instead?
         //              (note also that original code ignored trait assoc items)
         if promoted.is_none()
-            && !matches!(cx.tcx.def_kind(def), DefKind::Const | DefKind::AssocConst)
+            && cx.tcx.trait_of_assoc(def).is_none()
+            && !cx.tcx.has_attr(def, sym::type_const)
         {
             let qualifs = cx.tcx.at(constant.span).mir_const_qualif(def);
 

compiler/rustc_hir_analysis/src/lib.rs

@@ -94,11 +94,12 @@ use rustc_abi::{CVariadicStatus, ExternAbi};
 use rustc_hir::def::DefKind;
 use rustc_hir::lints::DelayedLint;
 use rustc_hir::{self as hir};
-use rustc_middle::middle;
+use rustc_middle::mir::interpret::GlobalId;
 use rustc_middle::query::Providers;
 use rustc_middle::ty::{Const, Ty, TyCtxt};
+use rustc_middle::{middle, ty};
 use rustc_session::parse::feature_err;
-use rustc_span::{ErrorGuaranteed, Span};
+use rustc_span::{ErrorGuaranteed, Span, sym};
 use rustc_trait_selection::traits;
 
 pub use crate::collect::suggest_impl_trait;
@@ -226,6 +227,17 @@ pub fn check_crate(tcx: TyCtxt<'_>) {
                 tcx.ensure_ok().eval_static_initializer(item_def_id);
                 check::maybe_check_static_with_link_section(tcx, item_def_id);
             }
+            DefKind::Const
+                if !tcx.generics_of(item_def_id).own_requires_monomorphization()
+                    && !tcx.has_attr(item_def_id, sym::type_const) =>
+            {
+                // FIXME(generic_const_items): Passing empty instead of identity args is fishy but
+                //                             seems to be fine for now. Revisit this!
+                let instance = ty::Instance::new_raw(item_def_id.into(), ty::GenericArgs::empty());
+                let cid = GlobalId { instance, promoted: None };
+                let typing_env = ty::TypingEnv::fully_monomorphized();
+                tcx.ensure_ok().eval_to_const_value_raw(typing_env.as_query_input(cid));
+            }
             _ => (),
         }
         // Skip `AnonConst`s because we feed their `type_of`.