[llvm] d775565 - [dwarfdump] Fix bogus incompatible tag warning

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2022-10-26T16:39:40-07:00
New Revision: d77556549a4ea940edba3dfa388cbec4c3bb7f20

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

LOG: [dwarfdump] Fix bogus incompatible tag warning

Because DW_TAG_LLVM_ptrauth_type is not marked as a type, dwarfdump
currently emits a spurious error: DIE has DW_AT_type with incompatible
tag DW_TAG_LLVM_ptrauth_type. This patch fixes that and adds a test.

Added: 
    

Modified: 
    llvm/include/llvm/BinaryFormat/Dwarf.def
    llvm/test/tools/llvm-dwarfdump/AArch64/ptrauth.s

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/BinaryFormat/Dwarf.def b/llvm/include/llvm/BinaryFormat/Dwarf.def
index ef328ccde09b3..7eeb93dbe0aa6 100644
--- a/llvm/include/llvm/BinaryFormat/Dwarf.def
+++ b/llvm/include/llvm/BinaryFormat/Dwarf.def
@@ -242,7 +242,7 @@ HANDLE_DW_TAG(0x420d, SUN_fortran_vax_structure, 0, SUN, DW_KIND_NONE)
 HANDLE_DW_TAG(0x42ff, SUN_hi, 0, SUN, DW_KIND_NONE)
 
 // LLVM
-HANDLE_DW_TAG(0x4300, LLVM_ptrauth_type, 0, LLVM, DW_KIND_NONE)
+HANDLE_DW_TAG(0x4300, LLVM_ptrauth_type, 0, LLVM, DW_KIND_TYPE)
 
 // DSP-C/Starcore __circ, _rev
 HANDLE_DW_TAG(0x5101, ALTIUM_circ_type, 0, ALTIUM, DW_KIND_NONE)

diff  --git a/llvm/test/tools/llvm-dwarfdump/AArch64/ptrauth.s b/llvm/test/tools/llvm-dwarfdump/AArch64/ptrauth.s
index 4d93528557cb9..d24a60d99bdac 100644
--- a/llvm/test/tools/llvm-dwarfdump/AArch64/ptrauth.s
+++ b/llvm/test/tools/llvm-dwarfdump/AArch64/ptrauth.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc %s -filetype obj -triple arm64-apple-darwin -o - \
-# RUN: | llvm-dwarfdump --debug-info - \
-# RUN: | FileCheck %s
+# RUN: llvm-mc %s -filetype obj -triple arm64-apple-darwin -o %t
+# RUN: llvm-dwarfdump --debug-info %t | FileCheck %s
+# RUN: llvm-dwarfdump --verify %t
 
 # CHECK: 0x0000001e:   DW_TAG_variable
 # CHECK:                 DW_AT_name      ("p1")