Applied PluginManager.cpp patch from Jean-Daniel Dupas.

Fixed problem Jean-Daniel Dupas found in ProcessGDBRemote.cpp.

llvm-svn: 105857

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 8bf90c2c22b..568e441ecee 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -245,10 +245,9 @@ ProcessGDBRemote::BuildDynamicRegisterInfo ()
                     else if (name.compare("offset") == 0)
                     {
                         uint32_t offset = Args::StringToUInt32(value.c_str(), UINT32_MAX, 0);
-                        if (offset != offset)
+                        if (reg_offset != offset)
                         {
                             reg_offset = offset;
-                            reg_info.byte_offset = offset;
                         }
                     }
                     else if (name.compare("encoding") == 0)
@@ -316,6 +315,7 @@ ProcessGDBRemote::BuildDynamicRegisterInfo ()
                     }
                 }
 
+                reg_info.byte_offset = reg_offset;
                 assert (reg_info.byte_size != 0);
                 reg_offset += reg_info.byte_size;
                 m_register_info.AddRegister(reg_info, reg_name, alt_name, set_name);