debuginfo: Bring back DW_AT_containing_type for vtables -- address re…

…view comments
rust-lang · Feb 8, 2022 · ed21805 · ed21805
1 parent fc7f419
commit ed21805
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
@@ -2662,11 +2662,13 @@ fn vtable_type_metadata<'ll, 'tcx>(
                 }
                 ty::VtblEntry::Method(_) => {
                     // Note: This code does not try to give a proper name to each method
-                    //       because their might be multiple methods with the same name
+                    //       because there might be multiple methods with the same name
                     //       (coming from different traits).
                     (format!("__method{}", index), void_pointer_type_debuginfo)
                 }
                 ty::VtblEntry::TraitVPtr(_) => {
+                    // Note: In the future we could try to set the type of this pointer
+                    //       to the type that we generate for the corresponding vtable.
                     (format!("__super_trait_ptr{}", index), void_pointer_type_debuginfo)
                 }
                 ty::VtblEntry::MetadataAlign => ("align".to_string(), usize_debuginfo),

diff --git a/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
@@ -470,7 +470,7 @@ fn push_debuginfo_type_name<'tcx>(
 }
 
 pub enum VTableNameKind {
-    // Is the name for const/static holding the vtable?
+    // Is the name for the const/static holding the vtable?
     GlobalVariable,
     // Is the name for the type of the vtable?
     Type,