[llvm-dwarfdump] Display DW_AT_high_pc as absolute value

DWARF4 relative DW_AT_high_pc values are now displayed as absolute
addresses. The relative value is only shown when explicitly dumping the
forms, i.e. in show-form or verbose mode.

```
DW_AT_low_pc	(0x0000000000000049)
DW_AT_high_pc	(0x00000019)
```

becomes

```
DW_AT_low_pc	(0x0000000000000049)
DW_AT_high_pc	(0x0000000000000062)
```

Differential revision: https://reviews.llvm.org/D40317

rdar://35416943

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319044 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/DebugInfo/DWARF/DWARFDie.cpp b/lib/DebugInfo/DWARF/DWARFDie.cpp
index a579c06d02e7ce8a5dcd92c688df96535d1cac41..6dd5ecb34e4511fd2f763f1198be0427cf042294 100644 (file)
--- a/lib/DebugInfo/DWARF/DWARFDie.cpp
+++ b/lib/DebugInfo/DWARF/DWARFDie.cpp
@@ -234,9 +234,17 @@ static void dumpAttribute(raw_ostream &OS, const DWARFDie &Die,
     WithColor(OS, Color) << Name;
   else if (Attr == DW_AT_decl_line || Attr == DW_AT_call_line)
     OS << *formValue.getAsUnsignedConstant();
-  else if (Attr == DW_AT_location || Attr == DW_AT_frame_base ||
-           Attr == DW_AT_data_member_location ||
-           Attr == DW_AT_GNU_call_site_value)
+  else if (Attr == DW_AT_high_pc && !DumpOpts.ShowForm && !DumpOpts.Verbose &&
+           formValue.getAsUnsignedConstant()) {
+    // Print the actual address rather than the offset.
+    uint64_t LowPC, HighPC, Index;
+    if (Die.getLowAndHighPC(LowPC, HighPC, Index))
+      OS << format("0x%016" PRIx64, HighPC);
+    else
+      formValue.dump(OS, DumpOpts);
+  } else if (Attr == DW_AT_location || Attr == DW_AT_frame_base ||
+             Attr == DW_AT_data_member_location ||
+             Attr == DW_AT_GNU_call_site_value)
     dumpLocation(OS, formValue, U, sizeof(BaseIndent) + Indent + 4, DumpOpts);
   else
     formValue.dump(OS, DumpOpts);

diff --git a/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test b/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
index bd4784deccf2a400b50c280b62f36bd2f642a2ef..060c49e65b5e5a5f516d9c76ea7b168b5d6a2d19 100644 (file)
--- a/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
+++ b/test/tools/dsymutil/X86/basic-lto-dw4-linking-x86.test
@@ -12,10 +12,10 @@ CHECK:    DW_AT_name ("basic1.c")
 CHECK:    DW_AT_stmt_list (0x00000000)
 CHECK:    DW_AT_comp_dir ("/Inputs")
 CHECK:    DW_AT_low_pc (0x0000000100000f40)
-CHECK:    DW_AT_high_pc (0x0000000b)
+CHECK:    DW_AT_high_pc (0x0000000100000f4b)
 CHECK:    DW_TAG_subprogram
 CHECK:      DW_AT_low_pc (0x0000000100000f40)
-CHECK:      DW_AT_high_pc (0x0000000b)
+CHECK:      DW_AT_high_pc (0x0000000100000f4b)
 CHECK:      DW_AT_frame_base (DW_OP_reg6 RBP)
 CHECK:      DW_AT_name ("main")
 CHECK:      DW_AT_decl_file ("/Inputs{{[/\\]}}basic1.c")
@@ -50,7 +50,7 @@ CHECK:    DW_AT_language (DW_LANG_C99)
 CHECK:    DW_AT_name ("basic2.c")
 CHECK:    DW_AT_stmt_list (0x00000044)
 CHECK:    DW_AT_low_pc (0x0000000100000f50)
-CHECK:    DW_AT_high_pc (0x00000037)
+CHECK:    DW_AT_high_pc (0x0000000100000f87)
 CHECK:    DW_TAG_base_type
 CHECK:      DW_AT_name ("int")
 CHECK:    DW_TAG_variable
@@ -66,7 +66,7 @@ CHECK:      DW_AT_type (cu + 0x002a
 CHECK:      DW_AT_inline (DW_INL_inlined)
 CHECK:    DW_TAG_subprogram
 CHECK:      DW_AT_low_pc (0x0000000100000f50)
-CHECK:      DW_AT_high_pc (0x00000037)
+CHECK:      DW_AT_high_pc (0x0000000100000f87)
 CHECK:      DW_AT_frame_base (DW_OP_reg6 RBP)
 CHECK:      DW_AT_name ("foo")
 CHECK:      DW_AT_decl_file ("/Inputs{{[/\\]}}basic2.c")
@@ -80,7 +80,7 @@ CHECK:        DW_AT_type (cu + 0x002a
 CHECK:      DW_TAG_inlined_subroutine
 CHECK:        DW_AT_abstract_origin (cu + 0x005b "inc")
 CHECK:        DW_AT_low_pc (0x0000000100000f61)
-CHECK:        DW_AT_high_pc (0x0000000f)
+CHECK:        DW_AT_high_pc (0x0000000100000f70)
 CHECK:      NULL
 CHECK:    NULL
 
@@ -91,7 +91,7 @@ CHECK:    DW_AT_producer ("clang version 3.7.0 ")
 CHECK:    DW_AT_name ("basic3.c")
 CHECK:    DW_AT_stmt_list (0x0000009a)
 CHECK:    DW_AT_low_pc (0x0000000100000f90)
-CHECK:    DW_AT_high_pc (0x00000024)
+CHECK:    DW_AT_high_pc (0x0000000100000fb4)
 CHECK:    DW_TAG_variable
 CHECK:      DW_AT_name ("val")
 CHECK:      DW_AT_decl_file ("/Inputs{{[/\\]}}basic3.c")
@@ -102,7 +102,7 @@ CHECK:      DW_AT_name ("inc")
 CHECK:      DW_AT_inline (DW_INL_inlined)
 CHECK:    DW_TAG_subprogram
 CHECK:      DW_AT_low_pc (0x0000000100000f90)
-CHECK:      DW_AT_high_pc (0x00000024)
+CHECK:      DW_AT_high_pc (0x0000000100000fb4)
 CHECK:      DW_AT_frame_base (DW_OP_reg6 RBP)
 CHECK:      DW_AT_name ("bar")
 CHECK:      DW_TAG_formal_parameter

diff --git a/test/tools/llvm-dwarfdump/X86/form.test b/test/tools/llvm-dwarfdump/X86/form.test
index 92b7996a06d075d62ec2d633da49cf8e60154154..7b555d8833893232ee94908377bb8b474e3eda06 100644 (file)
--- a/test/tools/llvm-dwarfdump/X86/form.test
+++ b/test/tools/llvm-dwarfdump/X86/form.test
@@ -1,5 +1,6 @@
 # This test verifies that DWARF form types are printed in verbose mode and when
-# passing -F but not in brief mode.
+# passing -F but not in brief mode. Additionally we check that the high pc is
+# not printed as an address in verbose or show-form mode.
 
 # RUN: llvm-mc %S/brief.s -filetype obj -triple x86_64-apple-darwin -o - \
 # RUN: | llvm-dwarfdump -v --debug-info - \
@@ -20,11 +21,11 @@
 # CHECK: DW_AT_stmt_list [DW_FORM_sec_offset]
 # CHECK: DW_AT_comp_dir [DW_FORM_strp]
 # CHECK: DW_AT_low_pc [DW_FORM_addr]
-# CHECK: DW_AT_high_pc [DW_FORM_data4]
+# CHECK: DW_AT_high_pc [DW_FORM_data4] (0x00000008)
 
 # CHECK: DW_TAG_subprogram
 # CHECK: DW_AT_low_pc [DW_FORM_addr]
-# CHECK: DW_AT_high_pc [DW_FORM_data4]
+# CHECK: DW_AT_high_pc [DW_FORM_data4] (0x00000008)
 # CHECK: DW_AT_frame_base [DW_FORM_exprloc]
 # CHECK: DW_AT_name [DW_FORM_strp]
 # CHECK: DW_AT_decl_file [DW_FORM_data1]
@@ -38,3 +39,7 @@
 # CHECK: DW_AT_byte_size [DW_FORM_data1]
 
 # NO-FORM-NOT: DW_FORM_
+# NO-FORM: DW_AT_high_pc (0x0000000000000008)
+# NO-FORM-NOT: DW_FORM_
+# NO-FORM: DW_AT_high_pc (0x0000000000000008)
+# NO-FORM-NOT: DW_FORM_

diff --git a/test/tools/llvm-dwarfdump/X86/gnu_call_site.s b/test/tools/llvm-dwarfdump/X86/gnu_call_site.s
index d2896a4cfe5c1d406d09e6d7d016a3ce4e6f75b8..096c52ed96693336e1d161871a48e338028a6e82 100644 (file)
--- a/test/tools/llvm-dwarfdump/X86/gnu_call_site.s
+++ b/test/tools/llvm-dwarfdump/X86/gnu_call_site.s
@@ -6,7 +6,7 @@
 # CHECK-NEXT:   DW_AT_name      ("fn4")
 # CHECK-NEXT:   DW_AT_linkage_name      ("test")
 # CHECK-NEXT:   DW_AT_low_pc    (0x0000000000000000)
-# CHECK-NEXT:   DW_AT_high_pc   (0x00000000)
+# CHECK-NEXT:   DW_AT_high_pc   (0x0000000000000000)
 # CHECK-NEXT:   DW_AT_frame_base        (DW_OP_call_frame_cfa)
 # CHECK-NEXT:   DW_AT_GNU_all_call_sites        (true)
 

diff --git a/test/tools/llvm-dwarfdump/X86/lookup.s b/test/tools/llvm-dwarfdump/X86/lookup.s
index 47a9e554fca5b8a4879d6c9debcdb69f3126e3e0..d095b8b388a256f5ef88c1f66dc1d772c9f49b60 100644 (file)
--- a/test/tools/llvm-dwarfdump/X86/lookup.s
+++ b/test/tools/llvm-dwarfdump/X86/lookup.s
@@ -21,16 +21,16 @@
 # CHECK:   DW_AT_name        ("foo.c")
 # CHECK:   DW_AT_stmt_list   (0x00000000)
 # CHECK:   DW_AT_low_pc      (0x0000000000000000)
-# CHECK:   DW_AT_high_pc     (0x00000016)
+# CHECK:   DW_AT_high_pc     (0x0000000000000016)
 
 # CHECK: DW_TAG_subprogram
 # CHECK:     DW_AT_low_pc    (0x0000000000000000)
-# CHECK:     DW_AT_high_pc   (0x00000016)
+# CHECK:     DW_AT_high_pc   (0x0000000000000016)
 # CHECK:     DW_AT_name      ("foo")
 
 # LEX: DW_TAG_lexical_block
 # LEX:       DW_AT_low_pc  (0x0000000000000004)
-# LEX:       DW_AT_high_pc (0x00000010)
+# LEX:       DW_AT_high_pc (0x0000000000000014)
 
 # A: Line info: file 'foo.c', line 3, column 9, start line 1
 # B: Line info: file 'foo.c', line 4, column 6, start line 1