From 5ce5f310cc1d08fd27d16f0335ff74f56ef321c2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 1 Aug 2018 00:25:46 +0200 Subject: [PATCH 1/2] check_const: use the same ParamEnv as codegen for statics --- src/librustc_lint/builtin.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 7cb4f7d386098..223edd16c635a 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -1630,7 +1630,12 @@ fn validate_const<'a, 'tcx>( fn check_const(cx: &LateContext, body_id: hir::BodyId, what: &str) { let def_id = cx.tcx.hir.body_owner_def_id(body_id); - let param_env = cx.tcx.param_env(def_id); + let is_static = cx.tcx.is_static(def_id).is_some(); + let param_env = if is_static { + ty::ParamEnv::reveal_all() + } else { + cx.tcx.param_env(def_id) + }; let cid = ::rustc::mir::interpret::GlobalId { instance: ty::Instance::mono(cx.tcx, def_id), promoted: None @@ -1638,8 +1643,8 @@ fn check_const(cx: &LateContext, body_id: hir::BodyId, what: &str) { match cx.tcx.const_eval(param_env.and(cid)) { Ok(val) => validate_const(cx.tcx, val, param_env, cid, what), Err(err) => { - // errors for statics are already reported directly in the query - if cx.tcx.is_static(def_id).is_none() { + // errors for statics are already reported directly in the query, avoid duplicates + if !is_static { let span = cx.tcx.def_span(def_id); err.report_as_lint( cx.tcx.at(span), From 222dd1794452308724bfdf2842d50718a710b22c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 1 Aug 2018 08:39:30 +0200 Subject: [PATCH 2/2] add comment --- src/librustc_lint/builtin.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 223edd16c635a..cf3a5449b0395 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -1632,6 +1632,7 @@ fn check_const(cx: &LateContext, body_id: hir::BodyId, what: &str) { let def_id = cx.tcx.hir.body_owner_def_id(body_id); let is_static = cx.tcx.is_static(def_id).is_some(); let param_env = if is_static { + // Use the same param_env as `codegen_static_initializer`, to reuse the cache. ty::ParamEnv::reveal_all() } else { cx.tcx.param_env(def_id)