diff options
| author | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-08-12 12:22:56 +0200 |
|---|---|---|
| committer | Bastian Kauschke <bastian_kauschke@hotmail.de> | 2020-08-13 16:55:16 +0200 |
| commit | cd53760cc7751b65943feb6437af28d5ccb6e770 (patch) | |
| tree | d9b23c013d5e129d5b96ba55ca8af7b714ea56a6 /src/librustc_mir/transform/inline.rs | |
| parent | 4745cbe83e0b3299bfe7f7f305b975c3c09f92db (diff) | |
| download | rust-cd53760cc7751b65943feb6437af28d5ccb6e770.tar.gz rust-cd53760cc7751b65943feb6437af28d5ccb6e770.zip | |
merge `as_local_hir_id` with `local_def_id_to_hir_id`
Diffstat (limited to 'src/librustc_mir/transform/inline.rs')
| -rw-r--r-- | src/librustc_mir/transform/inline.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 92ea162e419..315d4fa9d47 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -75,7 +75,7 @@ impl Inliner<'tcx> { let param_env = self.tcx.param_env_reveal_all_normalized(self.source.def_id()); // Only do inlining into fn bodies. - let id = self.tcx.hir().as_local_hir_id(self.source.def_id().expect_local()); + let id = self.tcx.hir().local_def_id_to_hir_id(self.source.def_id().expect_local()); if self.tcx.hir().body_owner_kind(id).is_fn_or_closure() && self.source.promoted.is_none() { for (bb, bb_data) in caller_body.basic_blocks().iter_enumerated() { if let Some(callsite) = @@ -101,9 +101,9 @@ impl Inliner<'tcx> { } let callee_body = if let Some(callee_def_id) = callsite.callee.as_local() { - let callee_hir_id = self.tcx.hir().as_local_hir_id(callee_def_id); + let callee_hir_id = self.tcx.hir().local_def_id_to_hir_id(callee_def_id); let self_hir_id = - self.tcx.hir().as_local_hir_id(self.source.def_id().expect_local()); + self.tcx.hir().local_def_id_to_hir_id(self.source.def_id().expect_local()); // Avoid a cycle here by only using `optimized_mir` only if we have // a lower `HirId` than the callee. This ensures that the callee will // not inline us. This trick only works without incremental compilation. |
