diff options
Diffstat (limited to 'lldb/tools/debugserver')
7 files changed, 13 insertions, 11 deletions
diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp index f630d0b47da..5462cc40f1f 100644 --- a/lldb/tools/debugserver/source/DNB.cpp +++ b/lldb/tools/debugserver/source/DNB.cpp @@ -446,7 +446,7 @@ DNBProcessLaunch (const char *path, else { bool res = AddProcessToMap(pid, processSP); - (void)res; + UNUSED_IF_ASSERT_DISABLED(res); assert(res && "Couldn't add process to map!"); return pid; } @@ -495,7 +495,7 @@ DNBProcessAttach (nub_process_t attach_pid, struct timespec *timeout, char *err_ if (pid != INVALID_NUB_PROCESS) { bool res = AddProcessToMap(pid, processSP); - (void)res; + UNUSED_IF_ASSERT_DISABLED(res); assert(res && "Couldn't add process to map!"); spawn_waitpid_thread(pid); } diff --git a/lldb/tools/debugserver/source/DNBDefs.h b/lldb/tools/debugserver/source/DNBDefs.h index 15c33d5a3c5..b42329e5846 100644 --- a/lldb/tools/debugserver/source/DNBDefs.h +++ b/lldb/tools/debugserver/source/DNBDefs.h @@ -365,4 +365,6 @@ typedef nub_addr_t (*DNBCallbackNameToAddress)(nub_process_t pid, const char *na typedef nub_size_t (*DNBCallbackCopyExecutableImageInfos)(nub_process_t pid, struct DNBExecutableImageInfo **image_infos, nub_bool_t only_changed, void *baton); typedef void (*DNBCallbackLog)(void *baton, uint32_t flags, const char *format, va_list args); +#define UNUSED_IF_ASSERT_DISABLED(x) ((void)(x)) + #endif // #ifndef __DNBDefs_h__ diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm index 44c2c81d08b..b635b8afdd5 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm +++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm @@ -1032,7 +1032,7 @@ MachProcess::WriteMemory (nub_addr_t addr, nub_size_t size, const void *buf) DNBBreakpoint *bp = bps[i]; const bool intersects = bp->IntersectsRange(addr, size, &intersect_addr, &intersect_size, &opcode_offset); - (void)intersects; + UNUSED_IF_ASSERT_DISABLED(intersects); assert(intersects); assert(addr <= intersect_addr && intersect_addr < addr + size); assert(addr < intersect_addr + intersect_size && intersect_addr + intersect_size <= addr + size); diff --git a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp index 0225873570f..b19a5b94b27 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp @@ -2060,7 +2060,7 @@ DNBArchMachARM::GetRegisterContext (void *buf, nub_size_t buf_len) p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } @@ -2094,7 +2094,7 @@ DNBArchMachARM::SetRegisterContext (const void *buf, nub_size_t buf_len) p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); if (SetGPRState() | SetVFPState() | SetEXCState()) diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp index ab81a6d3949..5d2b14dd303 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -1995,7 +1995,7 @@ DNBArchMachARM64::GetRegisterContext (void *buf, nub_size_t buf_len) p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM64::GetRegisterContext (buf = %p, len = %zu) => %zu", buf, buf_len, size); @@ -2028,7 +2028,7 @@ DNBArchMachARM64::SetRegisterContext (const void *buf, nub_size_t buf_len) p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); SetGPRState(); SetVFPState(); diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp index f3b29da57e1..00463431477 100644 --- a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -1703,7 +1703,7 @@ DNBArchImplI386::GetRegisterContext (void *buf, nub_size_t buf_len) // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } } @@ -1789,7 +1789,7 @@ DNBArchImplI386::SetRegisterContext (const void *buf, nub_size_t buf_len) // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); kern_return_t kret; if ((kret = SetGPRState()) != KERN_SUCCESS) 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 76c9160eddc..2867cd02934 100644 --- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -2089,7 +2089,7 @@ DNBArchImplX86_64::GetRegisterContext (void *buf, nub_size_t buf_len) // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } @@ -2177,7 +2177,7 @@ DNBArchImplX86_64::SetRegisterContext (const void *buf, nub_size_t buf_len) // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; - (void)bytes_written; + UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); kern_return_t kret; |
