[llvm] 4c71c33 - [DWARF] Support 'G' in dwarf parser

[Florian Mayer via llvm-commits]

Author: Florian Mayer
Date: 2022-06-08T12:39:53-07:00
New Revision: 4c71c3386c5c79560517a22e75938c9951f8de68

URL: https://github.com/llvm/llvm-project/commit/4c71c3386c5c79560517a22e75938c9951f8de68
DIFF: https://github.com/llvm/llvm-project/commit/4c71c3386c5c79560517a22e75938c9951f8de68.diff

LOG: [DWARF] Support 'G' in dwarf parser

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D127171

Added: 
    llvm/test/DebugInfo/AArch64/stack-tagging-cfi.s

Modified: 
    llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
index 86b4a2fe270fc..9e5cbc601546f 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
@@ -1138,6 +1138,10 @@ Error DWARFDebugFrame::parse(DWARFDataExtractor Data) {
             // B-Key is used for signing functions associated with this
             // augmentation string
             break;
+            // This stack frame contains MTE tagged data, so needs to be
+            // untagged on unwind.
+          case 'G':
+            break;
           }
         }
 

diff  --git a/llvm/test/DebugInfo/AArch64/stack-tagging-cfi.s b/llvm/test/DebugInfo/AArch64/stack-tagging-cfi.s
new file mode 100644
index 0000000000000..a5e9c24261bc7
--- /dev/null
+++ b/llvm/test/DebugInfo/AArch64/stack-tagging-cfi.s
@@ -0,0 +1,16 @@
+# RUN: llvm-mc -filetype=obj -triple aarch64 -mattr=+mte %s -o %t.o
+# RUN: llvm-dwarfdump --eh-frame %t.o | FileCheck %s
+
+# CHECK: Augmentation:          "zRG"
+
+	.text
+	.globl	WithUnwind
+	.p2align	2
+	.type	WithUnwind, at function
+WithUnwind:
+	.cfi_startproc
+	.cfi_mte_tagged_frame
+	ret
+.Lfunc_end0:
+	.size	WithUnwind, .Lfunc_end0-WithUnwind
+	.cfi_endproc