forked from OSchip/llvm-project
ade59d5309
When dumping the traced instructions in a for loop, like this one
4: for (int a = 0; a < n; a++)
5: do something;
there might be multiple LineEntry objects for line 4, but with different address ranges. This was causing the dump command to dump something like this:
```
a.out`main + 11 at main.cpp:4
[1] 0x0000000000400518 movl $0x0, -0x8(%rbp)
[2] 0x000000000040051f jmp 0x400529 ; <+28> at main.cpp:4
a.out`main + 28 at main.cpp:4
[3] 0x0000000000400529 cmpl $0x3, -0x8(%rbp)
[4] 0x000000000040052d jle 0x400521 ; <+20> at main.cpp:5
```
which is confusing, as main.cpp:4 appears twice consecutively.
This diff fixes that issue by making the line entry comparison strictly about the line, column and file name. Before it was also comparing the address ranges, which we don't need because our output is strictly about what the user sees in the source.
Besides, I've noticed that the logic that traverses instructions and calculates symbols and disassemblies had too much coupling, and made my changes harder to implement, so I decided to decouple it. Now there are two methods for iterating over the instruction of a trace. The existing one does it on raw load addresses, but the one provides a SymbolContext and an InstructionSP, and does the calculations efficiently (not as efficient as possible for now though), so the caller doesn't need to care about these details. I think I'll be using that iterator to reconstruct the call stacks.
I was able to fix a test with this change.
Differential Revision: https://reviews.llvm.org/D100740
|
||
|---|---|---|
| .. | ||
| Address.cpp | ||
| AddressRange.cpp | ||
| AddressResolver.cpp | ||
| AddressResolverFileLine.cpp | ||
| CMakeLists.txt | ||
| Communication.cpp | ||
| CoreProperties.td | ||
| Debugger.cpp | ||
| Declaration.cpp | ||
| Disassembler.cpp | ||
| DumpDataExtractor.cpp | ||
| DumpRegisterValue.cpp | ||
| DynamicLoader.cpp | ||
| EmulateInstruction.cpp | ||
| FileLineResolver.cpp | ||
| FileSpecList.cpp | ||
| FormatEntity.cpp | ||
| Highlighter.cpp | ||
| IOHandler.cpp | ||
| IOHandlerCursesGUI.cpp | ||
| Mangled.cpp | ||
| Module.cpp | ||
| ModuleChild.cpp | ||
| ModuleList.cpp | ||
| Opcode.cpp | ||
| PluginManager.cpp | ||
| Progress.cpp | ||
| RichManglingContext.cpp | ||
| SearchFilter.cpp | ||
| Section.cpp | ||
| SourceLocationSpec.cpp | ||
| SourceManager.cpp | ||
| StreamAsynchronousIO.cpp | ||
| StreamFile.cpp | ||
| UserSettingsController.cpp | ||
| Value.cpp | ||
| ValueObject.cpp | ||
| ValueObjectCast.cpp | ||
| ValueObjectChild.cpp | ||
| ValueObjectConstResult.cpp | ||
| ValueObjectConstResultCast.cpp | ||
| ValueObjectConstResultChild.cpp | ||
| ValueObjectConstResultImpl.cpp | ||
| ValueObjectDynamicValue.cpp | ||
| ValueObjectList.cpp | ||
| ValueObjectMemory.cpp | ||
| ValueObjectRegister.cpp | ||
| ValueObjectSyntheticFilter.cpp | ||
| ValueObjectUpdater.cpp | ||
| ValueObjectVariable.cpp | ||