Skip to content

Commit 52a9ba7

Browse files
authored
[clang][DebugInfo] Revert to printing canonical typenames for template aliases (#110767)
This was originally added in https://reviews.llvm.org/D142268 to have LLDB display variable typenames that benefit from suppressing defaulted template arguments. We currently represent template aliases as `DW_AT_typedef`s instead of `DW_TAG_template_alias`. This means for types like: ``` template <class _Tp> using __remove_cv_t = __remove_cv(_Tp); template <class _Tp> using remove_cv_t = __remove_cv_t<_Tp>; template<typename T> class optional { using value_type = T; remove_cv_t<value_type> __val_; } ``` we would generate DWARF like: ``` 0x0000274f: DW_TAG_typedef DW_AT_type (0x0000000000002758 "__remove_cv_t<value_type>") DW_AT_name ("remove_cv_t<value_type>") ``` This is an actual libc++ type layout introduced in #110355, and uncovered a shortcoming of LLDB's data-formatter infrastructure, where we cache formatters on the contents of `DW_AT_name` (which currently wouldn't be a fully resolved typename for template specializations). To unblock the libc++ change, I think we can revert this without much fallout. Then we have two options for follow-up (or do both): 1. reland this but adjust the LLDB formatter cache so it doesn't cache formatters for template specializations 2. implement support for `DW_TAG_template_alias` in LLDB (and make Clang generate them by default).
1 parent 7a0a524 commit 52a9ba7

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

clang/lib/CodeGen/CGDebugInfo.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,15 +1472,6 @@ llvm::DIType *CGDebugInfo::CreateType(const TemplateSpecializationType *Ty,
14721472
return AliasTy;
14731473
}
14741474

1475-
// Disable PrintCanonicalTypes here because we want
1476-
// the DW_AT_name to benefit from the TypePrinter's ability
1477-
// to skip defaulted template arguments.
1478-
//
1479-
// FIXME: Once -gsimple-template-names is enabled by default
1480-
// and we attach template parameters to alias template DIEs
1481-
// we don't need to worry about customizing the PrintingPolicy
1482-
// here anymore.
1483-
PP.PrintCanonicalTypes = false;
14841475
printTemplateArgumentList(OS, Ty->template_arguments(), PP,
14851476
TD->getTemplateParameters());
14861477
return DBuilder.createTypedef(Src, OS.str(), getOrCreateFile(Loc),

clang/test/CodeGenCXX/debug-info-alias.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ x::bar<int> bi;
2424
// CHECK: [[BFLOAT]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<float>"
2525
x::bar<float> bf;
2626
// CHECK: !DIGlobalVariable(name: "bz",{{.*}} type: [[BBAZ:![0-9]+]]
27-
// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int> >"
27+
// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int,{{ *}}int> >"
2828
x::bar<baz<int>> bz;
2929

3030
using

0 commit comments

Comments
 (0)