diff options
15 files changed, 22 insertions, 19 deletions
diff --git a/lldb/include/lldb/lldb-defines.h b/lldb/include/lldb/lldb-defines.h index 9dce69aef32..175cecd7e32 100644 --- a/lldb/include/lldb/lldb-defines.h +++ b/lldb/include/lldb/lldb-defines.h @@ -137,6 +137,8 @@ #define __attribute__(X) #endif +#define UNUSED_IF_ASSERT_DISABLED(x) ((void)(x)) + #if defined(__cplusplus) //---------------------------------------------------------------------- diff --git a/lldb/source/Host/posix/MainLoopPosix.cpp b/lldb/source/Host/posix/MainLoopPosix.cpp index dccd7fa8022..897f2d13c0c 100644 --- a/lldb/source/Host/posix/MainLoopPosix.cpp +++ b/lldb/source/Host/posix/MainLoopPosix.cpp @@ -97,7 +97,7 @@ void MainLoopPosix::UnregisterReadObject(IOObject::WaitableHandle handle) { bool erased = m_read_fds.erase(handle); - (void) erased; + UNUSED_IF_ASSERT_DISABLED(erased); assert(erased); } diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index 1da541b8c00..965ba5b7dc1 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -511,8 +511,7 @@ CommandInterpreter::LoadCommandDictionary () char buffer[1024]; int num_printed = snprintf(buffer, 1024, "%s %s", break_regexes[i][1], "-o"); assert (num_printed < 1024); - // Quiet unused variable warning for release builds. - (void) num_printed; + UNUSED_IF_ASSERT_DISABLED(num_printed); success = tbreak_regex_cmd_ap->AddRegexCommand (break_regexes[i][0], buffer); if (!success) break; diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 433137cbaf2..7a82d18b885 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -718,7 +718,7 @@ DynamicLoaderMacOSXDYLD::ReadAllImageInfosStructure () const size_t count_v13 = count_v11 + addr_size + // sharedCacheSlide sizeof (uuid_t); // sharedCacheUUID - (void) count_v13; // Avoid warnings when assertions are off. + UNUSED_IF_ASSERT_DISABLED(count_v13); assert (sizeof (buf) >= count_v13); Error error; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp index dfb609445f3..10f7f82828b 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp @@ -44,7 +44,7 @@ AppleObjCTypeEncodingParser::ReadQuotedString(lldb_utility::StringLexer& type) while (type.HasAtLeast(1) && type.Peek() != '"') buffer.Printf("%c",type.Next()); StringLexer::Character next = type.Next(); - (void) next; // Avoid warnings when assertions are off. + UNUSED_IF_ASSERT_DISABLED(next); assert (next == '"'); return buffer.GetString(); } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp index 207fa528d5d..bc1aceebc0c 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp @@ -133,7 +133,7 @@ GDBRemoteCommunicationServerPlatform::Handle_qLaunchGDBServer (StringExtractorGD int platform_port; std::string platform_path; bool ok = UriParser::Parse(GetConnection()->GetURI().c_str(), platform_scheme, platform_ip, platform_port, platform_path); - (void)ok; + UNUSED_IF_ASSERT_DISABLED(ok); assert(ok); Error error = StartDebugserverProcess ( platform_ip.c_str(), diff --git a/lldb/source/Symbol/ClangASTImporter.cpp b/lldb/source/Symbol/ClangASTImporter.cpp index 64542d1f5e6..038f26cf91a 100644 --- a/lldb/source/Symbol/ClangASTImporter.cpp +++ b/lldb/source/Symbol/ClangASTImporter.cpp @@ -623,7 +623,7 @@ ClangASTImporter::Minion::ExecuteDeportWorkQueues () m_decls_to_deport->erase(decl); DeclOrigin &origin = to_context_md->m_origins[decl]; - (void)origin; + UNUSED_IF_ASSERT_DISABLED(origin); assert (origin.ctx == m_source_ctx); // otherwise we should never have added this // because it doesn't need to be deported diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 61248c6e981..17318e7a82b 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -2843,7 +2843,7 @@ Process::WriteMemory (addr_t addr, const void *buf, size_t size, Error &error) size_t intersect_size; size_t opcode_offset; 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/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; |
