diff options
| author | Wesley Wiser <wwiser@gmail.com> | 2020-03-21 23:08:32 -0400 |
|---|---|---|
| committer | Wesley Wiser <wwiser@gmail.com> | 2020-03-21 23:08:32 -0400 |
| commit | 61d3be8de784e7ec2642c06daa5ff95f226d65d3 (patch) | |
| tree | f306403fc5a9b452b7c6716de9b5938b9efbb291 | |
| parent | 4f405119e8305b26d0ee9e857887d2720b5c5c2a (diff) | |
| download | rust-61d3be8de784e7ec2642c06daa5ff95f226d65d3.tar.gz rust-61d3be8de784e7ec2642c06daa5ff95f226d65d3.zip | |
Use Reveal::All in MIR inliner
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 52c7225a850..16c32e138fd 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -3,8 +3,8 @@ use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags; use rustc::mir::visit::*; use rustc::mir::*; -use rustc::ty::subst::{InternalSubsts, Subst, SubstsRef}; -use rustc::ty::{self, Instance, InstanceDef, ParamEnv, Ty, TyCtxt, TypeFoldable}; +use rustc::ty::subst::{Subst, SubstsRef}; +use rustc::ty::{self, Instance, InstanceDef, ParamEnv, Ty, TyCtxt}; use rustc_attr as attr; use rustc_hir::def_id::DefId; use rustc_index::bit_set::BitSet; @@ -66,14 +66,7 @@ impl Inliner<'tcx> { let mut callsites = VecDeque::new(); - let mut param_env = self.tcx.param_env(self.source.def_id()); - - let substs = &InternalSubsts::identity_for_item(self.tcx, self.source.def_id()); - - // For monomorphic functions, we can use `Reveal::All` to resolve specialized instances. - if !substs.needs_subst() { - param_env = param_env.with_reveal_all(); - } + let param_env = self.tcx.param_env(self.source.def_id()).with_reveal_all(); // Only do inlining into fn bodies. let id = self.tcx.hir().as_local_hir_id(self.source.def_id()).unwrap(); |
