bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Hold a TyCtxt in the HIR const-checker

Browse source
This commit is contained in:
Dylan MacKenzie 2019-11-15 14:46:11 -08:00
parent a98d20a260
commit 929ff68376
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_passes/check_const.rs
View file

@ -11,7 +11,6 @@ use rustc::hir::def_id::DefId;
use rustc::hir::intravisit::{Visitor, NestedVisitorMap}; use rustc::hir::intravisit::{Visitor, NestedVisitorMap};
use rustc::hir::map::Map; use rustc::hir::map::Map;
use rustc::hir; use rustc::hir;
use rustc::session::Session;
use rustc::ty::TyCtxt; use rustc::ty::TyCtxt;
use rustc::ty::query::Providers; use rustc::ty::query::Providers;
use syntax::ast::Mutability; use syntax::ast::Mutability;
@ -75,31 +74,29 @@ pub(crate) fn provide(providers: &mut Providers<'_>) {
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
struct CheckConstVisitor<'tcx> { struct CheckConstVisitor<'tcx> {
sess: &'tcx Session, tcx: TyCtxt<'tcx>,
hir_map: &'tcx Map<'tcx>,
const_kind: Option<ConstKind>, const_kind: Option<ConstKind>,
} }
impl<'tcx> CheckConstVisitor<'tcx> { impl<'tcx> CheckConstVisitor<'tcx> {
fn new(tcx: TyCtxt<'tcx>) -> Self { fn new(tcx: TyCtxt<'tcx>) -> Self {
CheckConstVisitor { CheckConstVisitor {
sess: &tcx.sess, tcx,
hir_map: tcx.hir(),
const_kind: None, const_kind: None,
} }
} }
/// Emits an error when an unsupported expression is found in a const context. /// Emits an error when an unsupported expression is found in a const context.
fn const_check_violated(&self, bad_op: &str, span: Span) { fn const_check_violated(&self, bad_op: &str, span: Span) {
if self.sess.opts.debugging_opts.unleash_the_miri_inside_of_you { if self.tcx.sess.opts.debugging_opts.unleash_the_miri_inside_of_you {
self.sess.span_warn(span, "skipping const checks"); self.tcx.sess.span_warn(span, "skipping const checks");
return; return;
} }
let const_kind = self.const_kind let const_kind = self.const_kind
.expect("`const_check_violated` may only be called inside a const context"); .expect("`const_check_violated` may only be called inside a const context");
span_err!(self.sess, span, E0744, "`{}` is not allowed in a `{}`", bad_op, const_kind); span_err!(self.tcx.sess, span, E0744, "`{}` is not allowed in a `{}`", bad_op, const_kind);
} }
/// Saves the parent `const_kind` before calling `f` and restores it afterwards. /// Saves the parent `const_kind` before calling `f` and restores it afterwards.
@ -113,7 +110,7 @@ impl<'tcx> CheckConstVisitor<'tcx> {
impl<'tcx> Visitor<'tcx> for CheckConstVisitor<'tcx> { impl<'tcx> Visitor<'tcx> for CheckConstVisitor<'tcx> {
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> { fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
NestedVisitorMap::OnlyBodies(&self.hir_map) NestedVisitorMap::OnlyBodies(&self.tcx.hir())
} }
fn visit_anon_const(&mut self, anon: &'tcx hir::AnonConst) { fn visit_anon_const(&mut self, anon: &'tcx hir::AnonConst) {
@ -122,7 +119,7 @@ impl<'tcx> Visitor<'tcx> for CheckConstVisitor<'tcx> {
} }
fn visit_body(&mut self, body: &'tcx hir::Body) { fn visit_body(&mut self, body: &'tcx hir::Body) {
let kind = ConstKind::for_body(body, self.hir_map); let kind = ConstKind::for_body(body, self.tcx.hir());
self.recurse_into(kind, |this| hir::intravisit::walk_body(this, body)); self.recurse_into(kind, |this| hir::intravisit::walk_body(this, body));
} }