debuginfo: give unique names to closure and generator types

Closure types have been moved to the namespace where they
are defined, and both closure and generator type names now
include the disambiguator.

This fixes an exception when lldb prints nested closures.

Fixes #57822

1 files changed, 10 insertions, 2 deletions

diff --git a/src/librustc_codegen_ssa/debuginfo/type_names.rs b/src/librustc_codegen_ssa/debuginfo/type_names.rs
index ea39913d4b9..b7c782528de 100644
--- a/src/librustc_codegen_ssa/debuginfo/type_names.rs
+++ b/src/librustc_codegen_ssa/debuginfo/type_names.rs
@@ -190,11 +190,19 @@ pub fn push_debuginfo_type_name<'tcx>(
             // processing
             visited.remove(t);
         },
-        ty::Closure(..) => {
+        ty::Closure(def_id, ..) => {
             output.push_str("closure");
+            let disambiguator = tcx.def_key(def_id).disambiguated_data.disambiguator;
+            if disambiguator != 0 {
+                output.push_str(&format!("-{}", disambiguator));
+            }
         }
-        ty::Generator(..) => {
+        ty::Generator(def_id, ..) => {
             output.push_str("generator");
+            let disambiguator = tcx.def_key(def_id).disambiguated_data.disambiguator;
+            if disambiguator != 0 {
+                output.push_str(&format!("-{}", disambiguator));
+            }
         }
         ty::Error |
         ty::Infer(_) |