From 7424655c2646c5b39127df39694a18f9e76c5567 Mon Sep 17 00:00:00 2001
From: Alexey Lapshin <a.v.lapshin@mail.ru>
Date: Mon, 26 Jun 2023 23:31:12 +0200
Subject: [PATCH] [DWARFv5][DWARFLinker] avoid stripping template names for
 .debug_names.

DWARFLinker puts three names for subprograms into the .apple_names and
.debug_names: short name, linkage name, name without template parameters.

DW_TAG_subprogram
   DW_AT_linkage_name "_Z3fooIcEvv"
   DW_AT_name "foo<char>"

short name: "foo<char>"
linkage name: "_Z3fooIcEvv"
name without template parameters: "foo"

DWARFv5 does not require stripping template parameters for subprogram name.
Current llvm-dwarfdump --verify reports the error if names stored in
accelerator table do not match with DIE name(name with stripped template
parameters stored in accelerator table does not match with original DIE name).
This patch does not store name without template parameters into the .debug_names table.

Differential Revision: https://reviews.llvm.org/D153869
---
 llvm/include/llvm/DWARFLinker/DWARFLinker.h        |   4 +++
 llvm/lib/DWARFLinker/DWARFLinker.cpp               |   3 +-
 llvm/test/tools/dsymutil/X86/Inputs/dwarf5-accel.o | Bin 0 -> 1952 bytes
 llvm/test/tools/dsymutil/X86/dwarf5-accel.test     |  34 +++++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/tools/dsymutil/X86/Inputs/dwarf5-accel.o
 create mode 100644 llvm/test/tools/dsymutil/X86/dwarf5-accel.test

diff --git a/llvm/include/llvm/DWARFLinker/DWARFLinker.h b/llvm/include/llvm/DWARFLinker/DWARFLinker.h
index eaf0bbb..8f1d2d0 100644
--- a/llvm/include/llvm/DWARFLinker/DWARFLinker.h
+++ b/llvm/include/llvm/DWARFLinker/DWARFLinker.h
@@ -361,6 +361,9 @@ public:
   void addAccelTableKind(AccelTableKind Kind) {
     assert(!llvm::is_contained(Options.AccelTables, Kind));
     Options.AccelTables.emplace_back(Kind);
+
+    if (Kind == AccelTableKind::Apple)
+      Options.CanStripTemplateName = true;
   }
 
   /// Set prepend path for clang modules.
@@ -882,6 +885,7 @@ private:
 
     /// The accelerator table kinds
     SmallVector<AccelTableKind, 1> AccelTables;
+    bool CanStripTemplateName = false;
 
     /// Prepend path for the clang modules.
     std::string PrependPath;
diff --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp
index 349be17..206ba9d 100644
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp
@@ -192,7 +192,8 @@ bool DWARFLinker::DIECloner::getDIENames(const DWARFDie &Die,
   if (!Info.MangledName)
     Info.MangledName = Info.Name;
 
-  if (StripTemplate && Info.Name && Info.MangledName != Info.Name) {
+  if (StripTemplate && Linker.Options.CanStripTemplateName && Info.Name &&
+      Info.MangledName != Info.Name) {
     StringRef Name = Info.Name.getString();
     if (std::optional<StringRef> StrippedName = StripTemplateParameters(Name))
       Info.NameWithoutTemplate = StringPool.getEntry(*StrippedName);
diff --git a/llvm/test/tools/dsymutil/X86/Inputs/dwarf5-accel.o b/llvm/test/tools/dsymutil/X86/Inputs/dwarf5-accel.o
new file mode 100644
index 0000000000000000000000000000000000000000..1620b85a7fd83317b5b8580a68d3b52cd3afb554
GIT binary patch
literal 1952
zcma)6T}TvB6h5=FvznXknu3XuL$qO#yRH&ti79F9Mns5O1a_I7oz;bPcH2L#hX_I;
z2&|VLdh%K5-N(Y9mmqrUp`r+(hkBPv>zq4hbazwoEN9NS-#z!+bMO6T-v0ctRR^G`
zfDd#p`dNDD=xFWet2DWXef2mKH)su-J4Q|*_Y;UFMA4crI=M3*AH6ZYGj_8RoDd&T
z4p4K1dEq_<*Mvw~iPE$v6!RjRN)?0{xjsC0$(;t5=M*FNxWDZJ0PfsDD)=N&%Qwag
zmpHEMlg~&b@>ZGlU)|pq=9%Q!uW_;ycI_{1r?OO1%XdZ|62MhnzqC)jS;Lf+wR{WA
z#{oX>lg~&d^Skx8$V7*^zfa6Jg7?cCt=X@coy{3$QIzbtw4D^<$_Ou&VVU`c7~DWU
zlIi%KeAbLe<&9a(Ss+BU{ysC`4D+4!Iea`M9lKK!a`lo)+mf;N{9?SD1QRSHA6e4X
z^Y*qKypm6fx<)T6%-8Rfg9mwPtm^!FagxrOw&e{pNT+%#B0R(A^ax`sj_EzUhF)n@
zTSZzq`Ja3u_HaG+;Ct}(=x?h0Mvv%=*n?NWskK1o5YYV8S{I@$1n9wh7(I<{qmzv0
z(C?rxpbzJA8A~@ahCQv9t$ZP!we@H;+!OB8yCm8jjrR1>xHsI}e-e^&Mm}}A+b~Tl
z6E<@>h)fi4StL<PXOe}CQMMvRIfI|2LNQWV3$sSrhO}J-bH>PHOX6l<Dw~a)qvbMS
zGC=SkD9uVJ)S{`Od|R-sBh=h+$X95?^9lo{Lx<JSIsbWoyyXIZLDjJ0fOg1%3G_xF
z-lB%^0FHwi8ua_=3NE8-pwwf)tMhV(1CRWo5$=H_G&!k)I*N&^kg}A?x_VH&aZG)n
zdGV+D@apMiHIQtW0qF8s`5-Pdl1Y{6JYw1YGf&K9%H1(g=7UP`U|s!VtU8XE<lOor
zjrsBVnu3d-i;c`D>*$5v*mUY#yteKZ*3b^l(0?h)uck%{)DAi(ow74k>GTA&qYCK>
zUOsvMeD%Yd&8N5Dwa3RwOZcTeur1?OO>I~&Y4A)t)^OS5L5ls#qEaJLPY|Sk1L&rR
jZTRS%De4?C$Z?D#wHi?FgN~7`2|YldYobzWLhA4@W-0Uf

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-accel.test b/llvm/test/tools/dsymutil/X86/dwarf5-accel.test
new file mode 100644
index 0000000..621fd80
--- /dev/null
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-accel.test
@@ -0,0 +1,34 @@
+## This test checks that DIE name with stripped template parameters
+## is not stored into .debug_name section.
+
+## cat dwarf5-accel.cpp
+##
+## template<typename A> void foo() {};
+##
+## int main ( void ) {
+##   foo<char>();
+##   return 0;
+## }
+
+## $ clang -gdwarf-5 dwarf5-accel.cpp -c -o dwarf5-accel.o
+
+#RUN: dsymutil -accelerator=Dwarf -oso-prepend-path %p/Inputs -y %s -o %t.dSYM
+#RUN: llvm-dwarfdump --verify  %t.dSYM | FileCheck %s --check-prefix VERIFY
+#RUN: llvm-dwarfdump -a --verbose  %t.dSYM | FileCheck %s
+
+#VERIFY: No errors.
+
+#CHECK: .debug_names
+#CHECK-NOT: "foo"
+#CHECK: _Z3fooIcEvv
+#CHECK-NOT: "foo"
+#CHECK: "foo<char>"
+
+---
+triple:          'x86_64-apple-darwin'
+objects:
+  - filename:        'dwarf5-accel.o'
+    timestamp:       1676048242
+    symbols:
+      - { sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000AB0, size: 0x00000008 }
+      - { sym: __Z3fooIcEvv, objAddr: 0x0000000000000020, binAddr: 0x0000000100000BB0, size: 0x00000008 }
-- 
2.7.4