From 4ab992d1b49d7ea0add7e67fc32f1ed49bb90d73 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Thu, 11 Feb 2016 23:40:14 +0000
Subject: [PATCH] [codeview] Dump def range lengths in hex

It makes it easier to correlate with assembly dumps, which are typically
given with hex offsets.

llvm-svn: 260619
---
 llvm/test/DebugInfo/COFF/local-variables.ll | 10 +++++-----
 llvm/test/MC/COFF/cv-def-range.s            |  2 +-
 llvm/tools/llvm-readobj/COFFDumper.cpp      |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/llvm/test/DebugInfo/COFF/local-variables.ll b/llvm/test/DebugInfo/COFF/local-variables.ll
index 82dab63..dcfcec5 100644
--- a/llvm/test/DebugInfo/COFF/local-variables.ll
+++ b/llvm/test/DebugInfo/COFF/local-variables.ll
@@ -122,7 +122,7 @@
 ; OBJ:      LocalVariableAddrRange {
 ; OBJ:        OffsetStart: .text+0x8
 ; OBJ:        ISectStart: 0x0
-; OBJ:        Range: 79
+; OBJ:        Range: 0x4F
 ; OBJ:      }
 ; OBJ:    }
 ; OBJ:    Local {
@@ -139,7 +139,7 @@
 ; OBJ:      LocalVariableAddrRange {
 ; OBJ:        OffsetStart: .text+0xC
 ; OBJ:        ISectStart: 0x0
-; OBJ:        Range: 33
+; OBJ:        Range: 0x21
 ; OBJ:      }
 ; OBJ:    }
 ; OBJ:    Local {
@@ -156,7 +156,7 @@
 ; OBJ:      LocalVariableAddrRange {
 ; OBJ:        OffsetStart: .text+0x2D
 ; OBJ:        ISectStart: 0x0
-; OBJ:        Range: 36
+; OBJ:        Range: 0x24
 ; OBJ:      }
 ; OBJ:    }
 ; OBJ:    InlineSite {
@@ -184,7 +184,7 @@
 ; OBJ:      LocalVariableAddrRange {
 ; OBJ:        OffsetStart: .text+0x14
 ; OBJ:        ISectStart: 0x0
-; OBJ:        Range: 25
+; OBJ:        Range: 0x19
 ; OBJ:      }
 ; OBJ:    }
 ; OBJ:    InlineSiteEnd {
@@ -214,7 +214,7 @@
 ; OBJ:      LocalVariableAddrRange {
 ; OBJ:        OffsetStart: .text+0x35
 ; OBJ:        ISectStart: 0x0
-; OBJ:        Range: 23
+; OBJ:        Range: 0x17
 ; OBJ:      }
 ; OBJ:    }
 ; OBJ:    InlineSiteEnd {
diff --git a/llvm/test/MC/COFF/cv-def-range.s b/llvm/test/MC/COFF/cv-def-range.s
index 781275d..a1ae140 100644
--- a/llvm/test/MC/COFF/cv-def-range.s
+++ b/llvm/test/MC/COFF/cv-def-range.s
@@ -81,7 +81,7 @@ Ltmp3:
 # CHECK:      LocalVariableAddrRange {
 # CHECK:        OffsetStart: .text+0x9
 # CHECK:        ISectStart: 0x0
-# CHECK:        Range: 15
+# CHECK:        Range: 0xF
 # CHECK:      }
 # CHECK:    }
 # CHECK:    BlockRelocations [
diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp
index ed8cc46..781185a 100644
--- a/llvm/tools/llvm-readobj/COFFDumper.cpp
+++ b/llvm/tools/llvm-readobj/COFFDumper.cpp
@@ -1907,7 +1907,7 @@ void COFFDumper::printLocalVariableAddrRange(
   DictScope S(W, "LocalVariableAddrRange");
   printRelocatedField("OffsetStart", Sec, SectionContents, &Range.OffsetStart);
   W.printHex("ISectStart", Range.ISectStart);
-  W.printNumber("Range", Range.Range);
+  W.printHex("Range", Range.Range);
 }
 
 void COFFDumper::printLocalVariableAddrGap(StringRef &SymData) {
@@ -1915,8 +1915,8 @@ void COFFDumper::printLocalVariableAddrGap(StringRef &SymData) {
     const LocalVariableAddrGap *Gap;
     error(consumeObject(SymData, Gap));
     ListScope S(W, "LocalVariableAddrGap");
-    W.printNumber("GapStartOffset", Gap->GapStartOffset);
-    W.printNumber("Range", Gap->Range);
+    W.printHex("GapStartOffset", Gap->GapStartOffset);
+    W.printHex("Range", Gap->Range);
   }
 }
 
-- 
2.7.4