From d7931f70471d6ec68dc89cbf992aa6ac7cee9947 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Mon, 14 Jan 2013 18:30:01 +0000 Subject: [PATCH] Fix a logic error in the condition for a warning log message. llvm-svn: 172442 --- lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp | 2 +- .../debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp index 7b4dcf72b53a..e3f00fcbd7c7 100644 --- 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 d0ba27ae28b6..266536d5245e 100644 --- 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;