diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2021-01-30 19:18:48 +0100 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2021-02-15 19:24:58 +0100 |
| commit | bd3cd5dbed5f56fb44a14a20dd2113e3049d2565 (patch) | |
| tree | 83063aac7f1834f2bb10070fdfc42fa3787f4d31 /compiler/rustc_mir/src | |
| parent | c676e358a506af3f97025fa248343552bddc57d9 (diff) | |
| download | rust-bd3cd5dbed5f56fb44a14a20dd2113e3049d2565.tar.gz rust-bd3cd5dbed5f56fb44a14a20dd2113e3049d2565.zip | |
Use an ItemId inside mir::GlobalAsm.
Diffstat (limited to 'compiler/rustc_mir/src')
| -rw-r--r-- | compiler/rustc_mir/src/monomorphize/collector.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_mir/src/monomorphize/partitioning/default.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_mir/src/monomorphize/collector.rs b/compiler/rustc_mir/src/monomorphize/collector.rs index 75f80f69bea..1cf809bef45 100644 --- a/compiler/rustc_mir/src/monomorphize/collector.rs +++ b/compiler/rustc_mir/src/monomorphize/collector.rs @@ -1030,7 +1030,7 @@ impl ItemLikeVisitor<'v> for RootCollector<'_, 'v> { "RootCollector: ItemKind::GlobalAsm({})", self.tcx.def_path_str(self.tcx.hir().local_def_id(item.hir_id).to_def_id()) ); - self.output.push(dummy_spanned(MonoItem::GlobalAsm(item.hir_id))); + self.output.push(dummy_spanned(MonoItem::GlobalAsm(item.item_id()))); } hir::ItemKind::Static(..) => { let def_id = self.tcx.hir().local_def_id(item.hir_id).to_def_id(); diff --git a/compiler/rustc_mir/src/monomorphize/partitioning/default.rs b/compiler/rustc_mir/src/monomorphize/partitioning/default.rs index d5a845dd76f..f814da786e5 100644 --- a/compiler/rustc_mir/src/monomorphize/partitioning/default.rs +++ b/compiler/rustc_mir/src/monomorphize/partitioning/default.rs @@ -314,7 +314,7 @@ fn characteristic_def_id_of_mono_item<'tcx>( Some(def_id) } MonoItem::Static(def_id) => Some(def_id), - MonoItem::GlobalAsm(hir_id) => Some(tcx.hir().local_def_id(hir_id).to_def_id()), + MonoItem::GlobalAsm(item_id) => Some(tcx.hir().local_def_id(item_id.hir_id()).to_def_id()), } } @@ -405,8 +405,8 @@ fn mono_item_visibility( Visibility::Hidden }; } - MonoItem::GlobalAsm(hir_id) => { - let def_id = tcx.hir().local_def_id(*hir_id); + MonoItem::GlobalAsm(item_id) => { + let def_id = tcx.hir().local_def_id(item_id.hir_id()); return if tcx.is_reachable_non_generic(def_id) { *can_be_internalized = false; default_visibility(tcx, def_id.to_def_id(), false) |