diff options
| author | bors <bors@rust-lang.org> | 2021-11-09 20:09:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-09 20:09:53 +0000 |
| commit | 8b09ba6a5d5c644fe0f1c27c7f9c80b334241707 (patch) | |
| tree | c1e060c6a7eb32839a870132cdc6655692db61c8 /compiler/rustc_codegen_llvm/src/debuginfo | |
| parent | d6082292a6f3207cbdacd6633a5b9d1476bb6772 (diff) | |
| parent | 9c1aa12ff11257c8a149b76e21e3cccac1893350 (diff) | |
| download | rust-8b09ba6a5d5c644fe0f1c27c7f9c80b334241707.tar.gz rust-8b09ba6a5d5c644fe0f1c27c7f9c80b334241707.zip | |
Auto merge of #90734 - matthiaskrgr:rollup-e1euotp, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #89561 (Type inference for inline consts) - #90035 (implement rfc-2528 type_changing-struct-update) - #90613 (Allow to run a specific rustdoc-js* test) - #90683 (Make `compiler-docs` only control the default instead of being a hard off-switch) - #90685 (x.py: remove fixme by deleting code) - #90701 (Record more artifact sizes during self-profiling.) - #90723 (Better document `Box` and `alloc::alloc::box_free` connection) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs index 1f1bd73c7d0..2a6bf7d9b1a 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs @@ -322,7 +322,7 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { type_names::push_item_name(self.tcx(), def_id, false, &mut name); // Find the enclosing function, in case this is a closure. - let enclosing_fn_def_id = self.tcx().closure_base_def_id(def_id); + let enclosing_fn_def_id = self.tcx().typeck_root_def_id(def_id); // Get_template_parameters() will append a `<...>` clause to the function // name if necessary. |