diff options
| author | bors <bors@rust-lang.org> | 2023-01-19 05:23:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-19 05:23:40 +0000 |
| commit | 65d2f2a5f9c323c88d1068e8e90d0b47a20d491c (patch) | |
| tree | dee0cdbd8d893160c307f5afb7cb8d7373d8dfca /compiler/rustc_codegen_llvm/src | |
| parent | 6ba6d22bdf5348e566dedc77a7dfee3f3804f2fb (diff) | |
| parent | 13555593672b49b5306990d63d0e61a49e17d9f0 (diff) | |
| download | rust-65d2f2a5f9c323c88d1068e8e90d0b47a20d491c.tar.gz rust-65d2f2a5f9c323c88d1068e8e90d0b47a20d491c.zip | |
Auto merge of #106810 - oli-obk:resolver_reverse_plumbing, r=petrochenkov
Various cleanups around pre-TyCtxt queries and functions part of #105462 based on https://github.com/rust-lang/rust/pull/106776 (everything starting at [0e2b39f](https://github.com/rust-lang/rust/pull/106810/commits/0e2b39fd1ffde51b50d45ccbe41de52b85136b8b) is new in this PR) r? `@petrochenkov` I think this should be most of the uncontroversial part of #105462.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 48e3a812e4f..b6eb5ee183f 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -782,10 +782,10 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>( codegen_unit_name: &str, debug_context: &CodegenUnitDebugContext<'ll, 'tcx>, ) -> &'ll DIDescriptor { - let mut name_in_debuginfo = match tcx.sess.local_crate_source_file { - Some(ref path) => path.clone(), - None => PathBuf::from(tcx.crate_name(LOCAL_CRATE).as_str()), - }; + let mut name_in_debuginfo = tcx + .sess + .local_crate_source_file() + .unwrap_or_else(|| PathBuf::from(tcx.crate_name(LOCAL_CRATE).as_str())); // To avoid breaking split DWARF, we need to ensure that each codegen unit // has a unique `DW_AT_name`. This is because there's a remote chance that |