diff options
| author | bors <bors@rust-lang.org> | 2020-08-15 03:08:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-15 03:08:03 +0000 |
| commit | 45060c2a66dfd667f88bd8b94261b28a58d85bd5 (patch) | |
| tree | aa173050fa295a736d6ab1e5a1a23529262e1b9b /src/librustc_codegen_ssa | |
| parent | 668a34e0f438d4a950b9440239656d6755ad963c (diff) | |
| parent | 29a946203aeebdd0d8466968705694fea9ca866f (diff) | |
| download | rust-45060c2a66dfd667f88bd8b94261b28a58d85bd5.tar.gz rust-45060c2a66dfd667f88bd8b94261b28a58d85bd5.zip | |
Auto merge of #75549 - tmandry:rollup-sxjwa0w, r=tmandry
Rollup of 4 pull requests Successful merges: - #75376 (Set CMAKE_SYSTEM_NAME when cross-compiling) - #75448 (merge `as_local_hir_id` with `local_def_id_to_hir_id`) - #75513 (Recover gracefully from `struct` parse errors) - #75545 (std/sys/unix/time: make it easier for LLVM to optimize `Instant` subtraction.) Failed merges: - #75514 (Replaced `log` with `tracing`) r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/symbol_export.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs index e7c789ad210..87d7f00c703 100644 --- a/src/librustc_codegen_ssa/back/symbol_export.rs +++ b/src/librustc_codegen_ssa/back/symbol_export.rs @@ -361,7 +361,7 @@ fn upstream_drop_glue_for_provider<'tcx>( fn is_unreachable_local_definition_provider(tcx: TyCtxt<'_>, def_id: DefId) -> bool { if let Some(def_id) = def_id.as_local() { - !tcx.reachable_set(LOCAL_CRATE).contains(&tcx.hir().as_local_hir_id(def_id)) + !tcx.reachable_set(LOCAL_CRATE).contains(&tcx.hir().local_def_id_to_hir_id(def_id)) } else { bug!("is_unreachable_local_definition called with non-local DefId: {:?}", def_id) } |