Index: source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp
===================================================================
--- source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp
+++ source/Plugins/Process/Utility/RegisterContextThreadMemory.cpp
@@ -59,7 +59,7 @@
                 {
                     OperatingSystem *os = process_sp->GetOperatingSystem ();
                     if (os->IsOperatingSystemPluginThread (thread_sp))
+                        m_reg_ctx_sp = os->CreateRegisterContextForThread (thread_sp.get(), m_register_data_addr);
-                        m_reg_ctx_sp = os->CreateRegisterContextForThread (thread_sp.get(), LLDB_INVALID_ADDRESS);
                 }
             }
         }