[DebugInfo]Print correct value for special opcode address increment

[jhenderson]

Summary

The wrong variable was being used when printing the address increment in verbose output of .debug_line. This patch fixes this.

[JDevlieghere]

lib/DebugInfo/DWARF/DWARFDebugLine.cpp

820 ↗

(On Diff #185063)

We should remove the cast.

[jhenderson]

Remove unnecessary cast.

[JDevlieghere]

LGTM, Thanks!

llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp

if (Opcode == 0) {
       uint64_t AddrOffset =
           (AdjustOpcode / Prologue.LineRange) * Prologue.MinInstLength;
       int32_t LineOffset =
           Prologue.LineBase + (AdjustOpcode % Prologue.LineRange);
       State.Row.Line += LineOffset;
       State.Row.Address += AddrOffset;
 
       if (OS) {
-        *OS << "address += " << ((uint32_t)AdjustOpcode)
-            << ",  line += " << LineOffset << "\n";
+        *OS << "address += " << AddrOffset << ",  line += " << LineOffset
+            << "\n";
         OS->indent(12);
         State.Row.dump(*OS);
       }
 
       State.appendRowToMatrix(*OffsetPtr);
       // Reset discriminator to 0.
       State.Row.Discriminator = 0;
     }

llvm/trunk/test/tools/llvm-dwarfdump/X86/verbose.test

 # CHECK: DW_AT_name [DW_FORM_strp]       ( .debug_str[0x{{.*}}] = "int")
 
 # CHECK: .debug_line contents:
 # CHECK: 00 DW_LNE_set_address (0x0000000000000000)
 # CHECK: 01 DW_LNS_copy
 # CHECK: 0x0000000000000000      1      0      1   0             0  is_stmt
 # CHECK: 05 DW_LNS_set_column (12)
 # CHECK: 0a DW_LNS_set_prologue_end
-# CHECK: 66 address += 89,  line += 0
+# CHECK: 66 address += 6,  line += 0
 # CHECK: 0x0000000000000006      1     12      1   0             0  is_stmt prologue_end
 # CHECK: 02 DW_LNS_advance_pc (2)
 # CHECK: 00 DW_LNE_end_sequence
 # CHECK: 0x0000000000000008      1     12      1   0             0  is_stmt end_sequence
 #
 # CHECK-NOT: {{.*}} contents: