This is an archive of the discontinued LLVM Phabricator instance.

Differential D57693

[DebugInfo]Print correct value for special opcode address increment
ClosedPublic

Authored by jhenderson on Feb 4 2019, 9:09 AM.

Details

Reviewers
JDevlieghere
probinson
dblaikie
wolfgangp
Commits
rGb6b5b1a5921e: [DebugInfo]Print correct value for special opcode address increment
rL353288: [DebugInfo]Print correct value for special opcode address increment
Summary

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

Diff Detail

Repository
rL LLVM

Event Timeline

jhenderson created this revision.Feb 4 2019, 9:09 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 4 2019, 9:09 AM
JDevlieghere added inline comments.Feb 4 2019, 12:41 PM
lib/DebugInfo/DWARF/DWARFDebugLine.cpp
820

We should remove the cast.

jhenderson updated this revision to Diff 185274.Feb 5 2019, 3:45 AM

Remove unnecessary cast.

JDevlieghere accepted this revision.Feb 5 2019, 2:56 PM

LGTM, Thanks!

This revision is now accepted and ready to land.Feb 5 2019, 2:56 PM
Closed by commit rL353288: [DebugInfo]Print correct value for special opcode address increment (authored by jhenderson). · Explain WhyFeb 6 2019, 2:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
DebugInfo/
DWARF/
2 lines
test/
tools/
llvm-dwarfdump/
X86/
2 lines

Diff 185063

lib/DebugInfo/DWARF/DWARFDebugLine.cpp

Show First 20 Lines • Show All 811 Lines • ▼ Show 20 Lines if (Opcode == 0) {
uint64_t AddrOffset = uint64_t AddrOffset =
(AdjustOpcode / Prologue.LineRange) * Prologue.MinInstLength; (AdjustOpcode / Prologue.LineRange) * Prologue.MinInstLength;
int32_t LineOffset = int32_t LineOffset =
Prologue.LineBase + (AdjustOpcode % Prologue.LineRange); Prologue.LineBase + (AdjustOpcode % Prologue.LineRange);
State.Row.Line += LineOffset; State.Row.Line += LineOffset;
State.Row.Address += AddrOffset; State.Row.Address += AddrOffset;
if (OS) { if (OS) {
*OS << "address += " << ((uint32_t)AdjustOpcode) *OS << "address += " << ((uint32_t)AddrOffset)
JDevlieghereUnsubmitted
Not Done
ReplyInline Actions

We should remove the cast.

JDevlieghere: We should remove the cast.
<< ", line += " << LineOffset << "\n"; << ", line += " << LineOffset << "\n";
OS->indent(12); OS->indent(12);
State.Row.dump(*OS); State.Row.dump(*OS);
} }
State.appendRowToMatrix(*OffsetPtr); State.appendRowToMatrix(*OffsetPtr);
// Reset discriminator to 0. // Reset discriminator to 0.
State.Row.Discriminator = 0; State.Row.Discriminator = 0;
▲ Show 20 Lines • Show All 285 Lines • Show Last 20 Lines

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

Show All 10 Lines
# CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{.*}}] = "int") # CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x{{.*}}] = "int")
# CHECK: .debug_line contents: # CHECK: .debug_line contents:
# CHECK: 00 DW_LNE_set_address (0x0000000000000000) # CHECK: 00 DW_LNE_set_address (0x0000000000000000)
# CHECK: 01 DW_LNS_copy # CHECK: 01 DW_LNS_copy
# CHECK: 0x0000000000000000 1 0 1 0 0 is_stmt # CHECK: 0x0000000000000000 1 0 1 0 0 is_stmt
# CHECK: 05 DW_LNS_set_column (12) # CHECK: 05 DW_LNS_set_column (12)
# CHECK: 0a DW_LNS_set_prologue_end # 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: 0x0000000000000006 1 12 1 0 0 is_stmt prologue_end
# CHECK: 02 DW_LNS_advance_pc (2) # CHECK: 02 DW_LNS_advance_pc (2)
# CHECK: 00 DW_LNE_end_sequence # CHECK: 00 DW_LNE_end_sequence
# CHECK: 0x0000000000000008 1 12 1 0 0 is_stmt end_sequence # CHECK: 0x0000000000000008 1 12 1 0 0 is_stmt end_sequence
# #
# CHECK-NOT: {{.*}} contents: # CHECK-NOT: {{.*}} contents: