Correctly create the register contexts in RegisterContextThreadMemory.

llvm-svn: 180908

1 files changed, 9 insertions, 8 deletions

diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp
index 1cef63d1e22..98bbc8b8038 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp
@@ -50,16 +50,17 @@ RegisterContextThreadMemory::UpdateRegisterContext ()
             }
             if (!m_reg_ctx_sp)
             {
-                OperatingSystem *os = process_sp->GetOperatingSystem ();
-                if (os->IsOperatingSystemPluginThread (thread_sp))
-                    m_reg_ctx_sp = os->CreateRegisterContextForThread (thread_sp.get(), LLDB_INVALID_ADDRESS);
-                else
+                ThreadSP backing_thread_sp (thread_sp->GetBackingThread());
+                if (backing_thread_sp)
                 {
-
-                    ThreadSP backing_thread_sp (thread_sp->GetBackingThread());
-                    if (backing_thread_sp)
-                        m_reg_ctx_sp = backing_thread_sp->GetRegisterContext();
+                    m_reg_ctx_sp = backing_thread_sp->GetRegisterContext();
                 }
+                else
+                {
+                    OperatingSystem *os = process_sp->GetOperatingSystem ();
+                    if (os->IsOperatingSystemPluginThread (thread_sp))
+                        m_reg_ctx_sp = os->CreateRegisterContextForThread (thread_sp.get(), LLDB_INVALID_ADDRESS);
+                }                
             }
         }
     }