Fix a logic error in the condition for a warning log message.

llvm-svn: 172442

diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
index 7b4dcf72b53a3c3840e2db68f40ccb577db6f2a6..e3f00fcbd7c7373562e9dda4c49928ff8731680a 100644 (file)
--- a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
@@ -821,7 +821,7 @@ DNBArchImplI386::GetWatchAddress(const DBG &debug_state, uint32_t hw_index)
 bool
 DNBArchImplI386::StartTransForHWP()
 {
-    if (m_2pc_trans_state != Trans_Done || m_2pc_trans_state != Trans_Rolled_Back)
+    if (m_2pc_trans_state != Trans_Done && m_2pc_trans_state != Trans_Rolled_Back)
         DNBLogError ("%s inconsistent state detected, expected %d or %d, got: %d", __FUNCTION__, Trans_Done, Trans_Rolled_Back, m_2pc_trans_state);
     m_2pc_dbg_checkpoint = m_state.context.dbg;
     m_2pc_trans_state = Trans_Pending;

diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
index d0ba27ae28b6ca39b7a297bca407fe57d4a86a34..266536d5245ea36c118cc31c167ad1e2240b69ad 100644 (file)
--- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
@@ -795,7 +795,7 @@ DNBArchImplX86_64::GetWatchAddress(const DBG &debug_state, uint32_t hw_index)
 bool
 DNBArchImplX86_64::StartTransForHWP()
 {
-    if (m_2pc_trans_state != Trans_Done || m_2pc_trans_state != Trans_Rolled_Back)
+    if (m_2pc_trans_state != Trans_Done && m_2pc_trans_state != Trans_Rolled_Back)
         DNBLogError ("%s inconsistent state detected, expected %d or %d, got: %d", __FUNCTION__, Trans_Done, Trans_Rolled_Back, m_2pc_trans_state);
     m_2pc_dbg_checkpoint = m_state.context.dbg;
     m_2pc_trans_state = Trans_Pending;