[Lldb-commits] [PATCH] D12877: [LLDB] Switch to assembly view if source is moved

[Mohit Bhakkad via lldb-commits]

mohit.bhakkad created this revision.
mohit.bhakkad added a reviewer: clayborg.
mohit.bhakkad added subscribers: jaydeep, bhushan, sagar, nitesh.jain, 
lldb-commits.
mohit.bhakkad set the repository for this revision to rL LLVM.

Repository:
  rL LLVM

http://reviews.llvm.org/D12877

Files:
  source/Target/StackFrame.cpp

Index: source/Target/StackFrame.cpp
===================================================================
--- source/Target/StackFrame.cpp
+++ source/Target/StackFrame.cpp
@@ -1503,12 +1503,15 @@
                 have_source = true;
                 if (source_lines_before > 0 || source_lines_after > 0)
                 {
-                    
target->GetSourceManager().DisplaySourceLinesWithLineNumbers 
(m_sc.line_entry.file,
+                    size_t num_lines = 
target->GetSourceManager().DisplaySourceLinesWithLineNumbers 
(m_sc.line_entry.file,
                                                                                
       m_sc.line_entry.line,
                                                                                
       source_lines_before,
                                                                                
       source_lines_after,
                                                                                
       "->",
                                                                                
       &strm);
+                    /* Source might have been moved or removed. If no lines 
are displayed then switch to assembly view */
+                    if (num_lines == 0)
+                        have_source = false;
                 }
             }
             switch (disasm_display)



Index: source/Target/StackFrame.cpp
===================================================================
--- source/Target/StackFrame.cpp
+++ source/Target/StackFrame.cpp
@@ -1503,12 +1503,15 @@
                 have_source = true;
                 if (source_lines_before > 0 || source_lines_after > 0)
                 {
-                    target->GetSourceManager().DisplaySourceLinesWithLineNumbers (m_sc.line_entry.file,
+                    size_t num_lines = target->GetSourceManager().DisplaySourceLinesWithLineNumbers (m_sc.line_entry.file,
                                                                                       m_sc.line_entry.line,
                                                                                       source_lines_before,
                                                                                       source_lines_after,
                                                                                       "->",
                                                                                       &strm);
+                    /* Source might have been moved or removed. If no lines are displayed then switch to assembly view */
+                    if (num_lines == 0)
+                        have_source = false;
                 }
             }
             switch (disasm_display)

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits