Move the SourceManager from the Debugger to the Target. That way it can store the per-Target default Source File & Line.
Set the default Source File & line to main (if it can be found.) at startup. Selecting the current thread & or frame resets
the current source file & line, and "source list" as well as the breakpoint command "break set -l <NUM>" will use the
current source file.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@139323 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/API/SBDebugger.cpp b/source/API/SBDebugger.cpp
index 70ca8b2..be6873b 100644
--- a/source/API/SBDebugger.cpp
+++ b/source/API/SBDebugger.cpp
@@ -360,7 +360,7 @@
SBSourceManager &
SBDebugger::GetSourceManager ()
{
- static SourceManager g_lldb_source_manager;
+ static SourceManager g_lldb_source_manager(NULL);
static SBSourceManager g_sb_source_manager (&g_lldb_source_manager);
return g_sb_source_manager;
}
diff --git a/source/API/SBSourceManager.cpp b/source/API/SBSourceManager.cpp
index 16193dd..0fa98e3 100644
--- a/source/API/SBSourceManager.cpp
+++ b/source/API/SBSourceManager.cpp
@@ -61,8 +61,7 @@
if (file.IsValid())
{
- return m_opaque_ptr->DisplaySourceLinesWithLineNumbers (NULL,
- *file,
+ return m_opaque_ptr->DisplaySourceLinesWithLineNumbers (*file,
line,
context_before,
context_after,
diff --git a/source/API/SBThread.cpp b/source/API/SBThread.cpp
index bcf8568..90efc45 100644
--- a/source/API/SBThread.cpp
+++ b/source/API/SBThread.cpp
@@ -32,7 +32,7 @@
#include "lldb/API/SBAddress.h"
#include "lldb/API/SBFrame.h"
-#include "lldb/API/SBSourceManager.h"
+// DONT THINK THIS IS NECESSARY: #include "lldb/API/SBSourceManager.h"
#include "lldb/API/SBDebugger.h"
#include "lldb/API/SBProcess.h"