3 files changed, 4 insertions, 3 deletions
diff --git a/lldb/source/API/SBBlock.cpp b/lldb/source/API/SBBlock.cpp
index 2ca8e76a478..e7485cc1d4e 100644
--- a/lldb/source/API/SBBlock.cpp
+++ b/lldb/source/API/SBBlock.cpp
@@ -39,7 +39,8 @@ SBBlock::AppendVariables (bool can_create, bool get_parent_variables, lldb_priva
 {
     if (IsValid())
     {
-        m_opaque_ptr->AppendVariables (can_create, get_parent_variables, var_list);
+        bool show_inline = true;
+        m_opaque_ptr->AppendVariables (can_create, get_parent_variables, show_inline, var_list);
     }
 }
 
diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index b8c2f700fb2..53307718143 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -116,7 +116,7 @@ uint32_t
 SBFrame::GetFrameID () const
 {
     if (m_opaque_sp)
-        return m_opaque_sp->GetID();
+        return m_opaque_sp->GetFrameIndex ();
     else
         return UINT32_MAX;
 }
diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp
index c5285fdbd41..087e29e0cf7 100644
--- a/lldb/source/API/SBThread.cpp
+++ b/lldb/source/API/SBThread.cpp
@@ -288,7 +288,7 @@ SBThread::DisplaySingleFrameForCurrentContext (FILE *out,
                        frame_idx,
                        GetThreadID(),
                        (long long)pc);
-            sc->DumpStopContext (&str, &m_opaque_sp->GetProcess(), *frame.GetPCAddress());
+            sc->DumpStopContext (&str, &m_opaque_sp->GetProcess(), *frame.GetPCAddress(), true, false);
             fprintf (out, "\n");
             success = true;
         }