https://github.com/Michael137 updated https://github.com/llvm/llvm-project/pull/110767
>From 53bfa785514f9811952aa5122f60d16129136285 Mon Sep 17 00:00:00 2001 From: Michael Buch <michaelbuc...@gmail.com> Date: Wed, 2 Oct 2024 00:42:35 +0100 Subject: [PATCH 1/3] [clang][DebugInfo] Revert to printing canonical typenames for template aliases This was originally added in https://reviews.llvm.org/D142268 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 https://github.com/llvm/llvm-project/pull/110355, which uncovered a shortcoming of LLDB's data-formatter infrastructure, which caches formatters on the contents of `DW_AT_name`. To unblock the libc++ change, we can revert this without much fallout. Then we have two options: 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). --- clang/lib/CodeGen/CGDebugInfo.cpp | 9 --------- clang/test/CodeGenCXX/debug-info-alias.cpp | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 8887c4de7c4c81..609957b75d6e7e 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -1472,15 +1472,6 @@ llvm::DIType *CGDebugInfo::CreateType(const TemplateSpecializationType *Ty, return AliasTy; } - // Disable PrintCanonicalTypes here because we want - // the DW_AT_name to benefit from the TypePrinter's ability - // to skip defaulted template arguments. - // - // FIXME: Once -gsimple-template-names is enabled by default - // and we attach template parameters to alias template DIEs - // we don't need to worry about customizing the PrintingPolicy - // here anymore. - PP.PrintCanonicalTypes = false; printTemplateArgumentList(OS, Ty->template_arguments(), PP, TD->getTemplateParameters()); return DBuilder.createTypedef(Src, OS.str(), getOrCreateFile(Loc), diff --git a/clang/test/CodeGenCXX/debug-info-alias.cpp b/clang/test/CodeGenCXX/debug-info-alias.cpp index bf2dbee4659592..3cd1446d25270e 100644 --- a/clang/test/CodeGenCXX/debug-info-alias.cpp +++ b/clang/test/CodeGenCXX/debug-info-alias.cpp @@ -24,7 +24,7 @@ x::bar<int> bi; // CHECK: [[BFLOAT]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<float>" x::bar<float> bf; // CHECK: !DIGlobalVariable(name: "bz",{{.*}} type: [[BBAZ:![0-9]+]] -// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int> >" +// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int, int> >" x::bar<baz<int>> bz; using >From f87dd63b285849b5dd17649b96343558b25c56ef Mon Sep 17 00:00:00 2001 From: Michael Buch <michaelbuc...@gmail.com> Date: Wed, 2 Oct 2024 17:11:32 +0100 Subject: [PATCH 2/3] fixup! fix whitespace expectation in test for Windows --- clang/test/CodeGenCXX/debug-info-alias.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/CodeGenCXX/debug-info-alias.cpp b/clang/test/CodeGenCXX/debug-info-alias.cpp index 3cd1446d25270e..852545a8927b08 100644 --- a/clang/test/CodeGenCXX/debug-info-alias.cpp +++ b/clang/test/CodeGenCXX/debug-info-alias.cpp @@ -24,7 +24,7 @@ x::bar<int> bi; // CHECK: [[BFLOAT]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<float>" x::bar<float> bf; // CHECK: !DIGlobalVariable(name: "bz",{{.*}} type: [[BBAZ:![0-9]+]] -// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int, int> >" +// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int,{{[ ].*}}int> >" x::bar<baz<int>> bz; using >From 0a21cd5e9563e3a5f4514f107f8c5d7485f5827d Mon Sep 17 00:00:00 2001 From: Michael Buch <michaelbuc...@gmail.com> Date: Wed, 2 Oct 2024 18:06:38 +0100 Subject: [PATCH 3/3] fixup! fix test regex --- clang/test/CodeGenCXX/debug-info-alias.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/CodeGenCXX/debug-info-alias.cpp b/clang/test/CodeGenCXX/debug-info-alias.cpp index 852545a8927b08..fbb2ad6e5ff089 100644 --- a/clang/test/CodeGenCXX/debug-info-alias.cpp +++ b/clang/test/CodeGenCXX/debug-info-alias.cpp @@ -24,7 +24,7 @@ x::bar<int> bi; // CHECK: [[BFLOAT]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<float>" x::bar<float> bf; // CHECK: !DIGlobalVariable(name: "bz",{{.*}} type: [[BBAZ:![0-9]+]] -// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int,{{[ ].*}}int> >" +// CHECK: [[BBAZ]] = !DIDerivedType(tag: DW_TAG_typedef, name: "bar<baz<int,{{ *}}int> >" x::bar<baz<int>> bz; using _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
