about summary refs log tree commit diff
path: root/compiler/rustc_mir_transform/src/const_prop.rs
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2022-03-29 23:50:01 +0200
committerCamille GILLOT <gillot.camille@gmail.com>2022-04-10 13:08:36 +0200
commitdb03a2deb090d5c24f15ef30cf4e5ccb13690b9d (patch)
tree0658d8e510c686e9554992b8013f977d71ce8c3e /compiler/rustc_mir_transform/src/const_prop.rs
parent341883d051ebbfaa6daa456b198d557fa0272b71 (diff)
downloadrust-db03a2deb090d5c24f15ef30cf4e5ccb13690b9d.tar.gz
rust-db03a2deb090d5c24f15ef30cf4e5ccb13690b9d.zip
Avoid accessing HIR from MIR queries.
Diffstat (limited to 'compiler/rustc_mir_transform/src/const_prop.rs')
-rw-r--r--compiler/rustc_mir_transform/src/const_prop.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/const_prop.rs b/compiler/rustc_mir_transform/src/const_prop.rs
index a342aeed905..aa47630a26a 100644
--- a/compiler/rustc_mir_transform/src/const_prop.rs
+++ b/compiler/rustc_mir_transform/src/const_prop.rs
@@ -71,8 +71,9 @@ impl<'tcx> MirPass<'tcx> for ConstProp {
         }
 
         let def_id = body.source.def_id().expect_local();
-        let is_fn_like = tcx.hir().get_by_def_id(def_id).fn_kind().is_some();
-        let is_assoc_const = tcx.def_kind(def_id) == DefKind::AssocConst;
+        let def_kind = tcx.def_kind(def_id);
+        let is_fn_like = def_kind.is_fn_like();
+        let is_assoc_const = def_kind == DefKind::AssocConst;
 
         // Only run const prop on functions, methods, closures and associated constants
         if !is_fn_like && !is_assoc_const {