diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2024-03-19 17:48:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 17:48:46 -0700 |
| commit | a289f66efd638c2af14cdb88968e4eaeea0c0605 (patch) | |
| tree | 564ed961f19cd55af753fcecba08d53d5fbb53c1 /lldb/source/Commands/CommandObjectSource.cpp | |
| parent | e2fa90fa0a4b7950dd0d7fae6933e89c075d0af0 (diff) | |
| download | llvm-a289f66efd638c2af14cdb88968e4eaeea0c0605.zip llvm-a289f66efd638c2af14cdb88968e4eaeea0c0605.tar.gz llvm-a289f66efd638c2af14cdb88968e4eaeea0c0605.tar.bz2 | |
Revert "[lldb] Store SupportFile in FileEntry (NFC)" (#85885)
Reverts llvm/llvm-project#85468 because @slackito reports this broke
stepping in one of their tests [1] and this patch was meant to be NFC.
[1]
https://github.com/llvm/llvm-project/commit/d5a277d309e92b1d3e493da6036cffdf815105b1#commitcomment-139991120
Diffstat (limited to 'lldb/source/Commands/CommandObjectSource.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectSource.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp index 0c12674..fde74f0 100644 --- a/lldb/source/Commands/CommandObjectSource.cpp +++ b/lldb/source/Commands/CommandObjectSource.cpp @@ -158,7 +158,7 @@ protected: if (module_list.GetSize() && module_list.GetIndexForModule(module) == LLDB_INVALID_INDEX32) continue; - if (!FileSpec::Match(file_spec, line_entry.GetFile())) + if (!FileSpec::Match(file_spec, line_entry.file)) continue; if (start_line > 0 && line_entry.line < start_line) continue; @@ -239,7 +239,7 @@ protected: num_matches++; if (num_lines > 0 && num_matches > num_lines) break; - assert(cu_file_spec == line_entry.GetFile()); + assert(cu_file_spec == line_entry.file); if (!cu_header_printed) { if (num_matches > 0) strm << "\n\n"; @@ -760,11 +760,11 @@ protected: bool operator<(const SourceInfo &rhs) const { if (function.GetCString() < rhs.function.GetCString()) return true; - if (line_entry.GetFile().GetDirectory().GetCString() < - rhs.line_entry.GetFile().GetDirectory().GetCString()) + if (line_entry.file.GetDirectory().GetCString() < + rhs.line_entry.file.GetDirectory().GetCString()) return true; - if (line_entry.GetFile().GetFilename().GetCString() < - rhs.line_entry.GetFile().GetFilename().GetCString()) + if (line_entry.file.GetFilename().GetCString() < + rhs.line_entry.file.GetFilename().GetCString()) return true; if (line_entry.line < rhs.line_entry.line) return true; @@ -799,7 +799,7 @@ protected: sc.function->GetEndLineSourceInfo(end_file, end_line); } else { // We have an inlined function - start_file = source_info.line_entry.GetFile(); + start_file = source_info.line_entry.file; start_line = source_info.line_entry.line; end_line = start_line + m_options.num_lines; } |