[Lldb-commits] [PATCH] D115313: [lldb/Target] Slide source display for artificial locations at function start
Med Ismail Bennani via Phabricator via lldb-commits
lldb-commits at lists.llvm.org
Wed Dec 8 10:54:28 PST 2021
mib updated this revision to Diff 392834.
mib retitled this revision from "[lldb/Target] Slide source display for artificial location at function start" to "[lldb/Target] Slide source display for artificial locations at function start".
mib added a comment.
Change warning to specify function name instead of source file name when possible.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D115313/new/
https://reviews.llvm.org/D115313
Files:
lldb/source/Target/StackFrame.cpp
lldb/test/API/source-manager/TestSourceManager.py
lldb/test/API/source-manager/artificial_location.c
Index: lldb/test/API/source-manager/artificial_location.c
===================================================================
--- /dev/null
+++ lldb/test/API/source-manager/artificial_location.c
@@ -0,0 +1,6 @@
+int foo() { return 42; }
+
+int main() {
+#line 0
+ return foo();
+}
Index: lldb/test/API/source-manager/TestSourceManager.py
===================================================================
--- lldb/test/API/source-manager/TestSourceManager.py
+++ lldb/test/API/source-manager/TestSourceManager.py
@@ -199,7 +199,6 @@
SOURCE_DISPLAYED_CORRECTLY,
substrs=['Hello world'])
-
# The '-b' option shows the line table locations from the debug information
# that indicates valid places to set source level breakpoints.
@@ -265,3 +264,17 @@
substrs=['stopped',
'main-copy.c:%d' % self.line,
'stop reason = breakpoint'])
+
+ def test_artificial_source_location(self):
+ src_file = 'artificial_location.c'
+ d = {'C_SOURCES': src_file }
+ self.build(dictionary=d)
+
+ lldbutil.run_to_source_breakpoint(
+ self, 'main',
+ lldb.SBFileSpec(src_file, False))
+
+ self.expect("run", RUN_SUCCEEDED,
+ substrs=['stop reason = breakpoint', '%s:%d' % (src_file,0),
+ 'Warning: the current PC is an artificial location'])
+
Index: lldb/source/Target/StackFrame.cpp
===================================================================
--- lldb/source/Target/StackFrame.cpp
+++ lldb/source/Target/StackFrame.cpp
@@ -1883,14 +1883,32 @@
if (m_sc.comp_unit && m_sc.line_entry.IsValid()) {
have_debuginfo = true;
if (source_lines_before > 0 || source_lines_after > 0) {
+ uint32_t start_line = m_sc.line_entry.line;
+ if (!start_line && m_sc.function) {
+ FileSpec source_file;
+ m_sc.function->GetStartLineSourceInfo(source_file, start_line);
+ }
+
size_t num_lines =
target->GetSourceManager().DisplaySourceLinesWithLineNumbers(
- m_sc.line_entry.file, m_sc.line_entry.line,
- m_sc.line_entry.column, source_lines_before,
- source_lines_after, "->", &strm);
+ m_sc.line_entry.file, start_line, m_sc.line_entry.column,
+ source_lines_before, source_lines_after, "->", &strm);
if (num_lines != 0)
have_source = true;
- // TODO: Give here a one time warning if source file is missing.
+ if (!num_lines || !m_sc.line_entry.line ||
+ m_sc.line_entry.line == LLDB_INVALID_LINE_NUMBER) {
+ ConstString fn_name = m_sc.GetFunctionName();
+
+ if (!fn_name.IsEmpty())
+ strm.Printf("Warning: the current PC is an artificial location "
+ "in function %s.",
+ fn_name.AsCString());
+ else
+ strm.Printf("Warning: the current PC is an artificial location "
+ "unassociated with a particular line in %s.",
+ m_sc.line_entry.file.GetFilename().GetCString());
+ strm.EOL();
+ }
}
}
switch (disasm_display) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D115313.392834.patch
Type: text/x-patch
Size: 3370 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20211208/0bdeef01/attachment.bin>
More information about the lldb-commits
mailing list