diff --git a/lldb/source/API/SBEvent.cpp b/lldb/source/API/SBEvent.cpp --- a/lldb/source/API/SBEvent.cpp +++ b/lldb/source/API/SBEvent.cpp @@ -175,7 +175,7 @@ LLDB_RECORD_STATIC_METHOD(const char *, SBEvent, GetCStringFromEvent, (const lldb::SBEvent &), event); - return reinterpret_cast( + return static_cast( EventDataBytes::GetBytesFromEvent(event.get())); } diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -1456,7 +1456,7 @@ done = true; } else if (event_type & CommandInterpreter::eBroadcastBitAsynchronousErrorData) { - const char *data = reinterpret_cast( + const char *data = static_cast( EventDataBytes::GetBytesFromEvent(event_sp.get())); if (data && data[0]) { StreamSP error_sp(GetAsyncErrorStream()); @@ -1467,7 +1467,7 @@ } } else if (event_type & CommandInterpreter:: eBroadcastBitAsynchronousOutputData) { - const char *data = reinterpret_cast( + const char *data = static_cast( EventDataBytes::GetBytesFromEvent(event_sp.get())); if (data && data[0]) { StreamSP output_sp(GetAsyncOutputStream()); diff --git a/lldb/source/Host/common/NativeProcessProtocol.cpp b/lldb/source/Host/common/NativeProcessProtocol.cpp --- a/lldb/source/Host/common/NativeProcessProtocol.cpp +++ b/lldb/source/Host/common/NativeProcessProtocol.cpp @@ -682,7 +682,7 @@ addr_t cache_line_bytes_left = cache_line_size - (curr_addr % cache_line_size); addr_t bytes_to_read = std::min(bytes_left, cache_line_bytes_left); - status = ReadMemory(curr_addr, reinterpret_cast(curr_buffer), + status = ReadMemory(curr_addr, static_cast(curr_buffer), bytes_to_read, bytes_read); if (bytes_read == 0) @@ -691,7 +691,7 @@ void *str_end = std::memchr(curr_buffer, '\0', bytes_read); if (str_end != nullptr) { total_bytes_read = - (size_t)(reinterpret_cast(str_end) - buffer + 1); + static_cast((static_cast(str_end) - buffer + 1)); status.Clear(); break; } diff --git a/lldb/source/Host/macosx/objcxx/Host.mm b/lldb/source/Host/macosx/objcxx/Host.mm --- a/lldb/source/Host/macosx/objcxx/Host.mm +++ b/lldb/source/Host/macosx/objcxx/Host.mm @@ -1013,7 +1013,7 @@ return false; posix_spawn_file_actions_t *file_actions = - reinterpret_cast(_file_actions); + static_cast(_file_actions); switch (info->GetAction()) { case FileAction::eFileActionNone: @@ -1447,7 +1447,7 @@ "(callback, pid=%i, monitor_signals=%i) " "source = %p\n", static_cast(pid), monitor_signals, - reinterpret_cast(source)); + static_cast(source)); if (source) { Host::MonitorChildProcessCallback callback_copy = callback; diff --git a/lldb/source/Host/posix/PipePosix.cpp b/lldb/source/Host/posix/PipePosix.cpp --- a/lldb/source/Host/posix/PipePosix.cpp +++ b/lldb/source/Host/posix/PipePosix.cpp @@ -270,8 +270,8 @@ while (error.Success()) { error = select_helper.Select(); if (error.Success()) { - auto result = ::read(fd, reinterpret_cast(buf) + bytes_read, - size - bytes_read); + auto result = + ::read(fd, static_cast(buf) + bytes_read, size - bytes_read); if (result != -1) { bytes_read += result; if (bytes_read == size || result == 0) @@ -301,9 +301,8 @@ while (error.Success()) { error = select_helper.Select(); if (error.Success()) { - auto result = - ::write(fd, reinterpret_cast(buf) + bytes_written, - size - bytes_written); + auto result = ::write(fd, static_cast(buf) + bytes_written, + size - bytes_written); if (result != -1) { bytes_written += result; if (bytes_written == size) diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp --- a/lldb/source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp @@ -388,8 +388,7 @@ // replace the old statement with the new one // - *last_stmt_ptr = - reinterpret_cast(result_initialization_stmt_result.get()); + *last_stmt_ptr = static_cast(result_initialization_stmt_result.get()); return true; } diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangDeclVendor.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangDeclVendor.cpp --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangDeclVendor.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangDeclVendor.cpp @@ -22,8 +22,7 @@ std::vector compiler_decls; uint32_t ret = FindDecls(name, /*append*/ false, max_matches, compiler_decls); for (CompilerDecl compiler_decl : compiler_decls) { - clang::Decl *d = - reinterpret_cast(compiler_decl.GetOpaqueDecl()); + clang::Decl *d = static_cast(compiler_decl.GetOpaqueDecl()); clang::NamedDecl *nd = llvm::cast(d); decls.push_back(nd); } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp @@ -2013,7 +2013,7 @@ } const uint8_t *const data = - reinterpret_cast(reg_value.GetBytes()); + static_cast(reg_value.GetBytes()); if (!data) { LLDB_LOGF(log, "GDBRemoteCommunicationServerLLGS::%s failed to get data " diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -3978,14 +3978,14 @@ void TargetProperties::Arg0ValueChangedCallback(void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); this_->m_launch_info.SetArg0(this_->GetArg0()); } void TargetProperties::RunArgsValueChangedCallback(void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); Args args; if (this_->GetRunArguments(args)) this_->m_launch_info.GetArguments() = args; @@ -3994,14 +3994,14 @@ void TargetProperties::EnvVarsValueChangedCallback(void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); this_->m_launch_info.GetEnvironment() = this_->GetEnvironment(); } void TargetProperties::InputPathValueChangedCallback(void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); this_->m_launch_info.AppendOpenFileAction( STDIN_FILENO, this_->GetStandardInputPath(), true, false); } @@ -4009,7 +4009,7 @@ void TargetProperties::OutputPathValueChangedCallback(void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); this_->m_launch_info.AppendOpenFileAction( STDOUT_FILENO, this_->GetStandardOutputPath(), false, true); } @@ -4017,7 +4017,7 @@ void TargetProperties::ErrorPathValueChangedCallback(void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); this_->m_launch_info.AppendOpenFileAction( STDERR_FILENO, this_->GetStandardErrorPath(), false, true); } @@ -4025,7 +4025,7 @@ void TargetProperties::DetachOnErrorValueChangedCallback( void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); if (this_->GetDetachOnError()) this_->m_launch_info.GetFlags().Set(lldb::eLaunchFlagDetachOnError); else @@ -4035,7 +4035,7 @@ void TargetProperties::DisableASLRValueChangedCallback( void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); if (this_->GetDisableASLR()) this_->m_launch_info.GetFlags().Set(lldb::eLaunchFlagDisableASLR); else @@ -4045,7 +4045,7 @@ void TargetProperties::DisableSTDIOValueChangedCallback( void *target_property_ptr, OptionValue *) { TargetProperties *this_ = - reinterpret_cast(target_property_ptr); + static_cast(target_property_ptr); if (this_->GetDisableSTDIO()) this_->m_launch_info.GetFlags().Set(lldb::eLaunchFlagDisableSTDIO); else diff --git a/lldb/source/Utility/DataExtractor.cpp b/lldb/source/Utility/DataExtractor.cpp --- a/lldb/source/Utility/DataExtractor.cpp +++ b/lldb/source/Utility/DataExtractor.cpp @@ -129,9 +129,8 @@ DataExtractor::DataExtractor(const void *data, offset_t length, ByteOrder endian, uint32_t addr_size, uint32_t target_byte_size /*=1*/) - : m_start(const_cast(reinterpret_cast(data))), - m_end(const_cast(reinterpret_cast(data)) + - length), + : m_start(const_cast(static_cast(data))), + m_end(const_cast(static_cast(data)) + length), m_byte_order(endian), m_addr_size(addr_size), m_data_sp(), m_target_byte_size(target_byte_size) { assert(addr_size == 4 || addr_size == 8); @@ -232,7 +231,7 @@ m_start = nullptr; m_end = nullptr; } else { - m_start = const_cast(reinterpret_cast(bytes)); + m_start = const_cast(static_cast(bytes)); m_end = m_start + length; } return GetByteSize(); diff --git a/lldb/source/Utility/Environment.cpp b/lldb/source/Utility/Environment.cpp --- a/lldb/source/Utility/Environment.cpp +++ b/lldb/source/Utility/Environment.cpp @@ -13,7 +13,7 @@ char *Environment::Envp::make_entry(llvm::StringRef Key, llvm::StringRef Value) { const size_t size = Key.size() + 1 /*=*/ + Value.size() + 1 /*\0*/; - char *Result = reinterpret_cast( + char *Result = static_cast( Allocator.Allocate(sizeof(char) * size, alignof(char))); char *Next = Result; @@ -26,7 +26,7 @@ } Environment::Envp::Envp(const Environment &Env) { - Data = reinterpret_cast( + Data = static_cast( Allocator.Allocate(sizeof(char *) * (Env.size() + 1), alignof(char *))); char **Next = Data; for (const auto &KV : Env) diff --git a/lldb/source/Utility/Scalar.cpp b/lldb/source/Utility/Scalar.cpp --- a/lldb/source/Utility/Scalar.cpp +++ b/lldb/source/Utility/Scalar.cpp @@ -74,7 +74,7 @@ bool Scalar::GetData(DataExtractor &data, size_t limit_byte_size) const { size_t byte_size = GetByteSize(); if (byte_size > 0) { - const uint8_t *bytes = reinterpret_cast(GetBytes()); + const uint8_t *bytes = static_cast(GetBytes()); if (limit_byte_size < byte_size) { if (endian::InlHostByteOrder() == eByteOrderLittle) { @@ -132,7 +132,7 @@ swapped_words[1] = apint_words[0]; apint_words = swapped_words; } - return reinterpret_cast(apint_words); + return static_cast(apint_words); case e_sint256: case e_uint256: apint_words = m_integer.getRawData(); @@ -143,7 +143,7 @@ swapped_words[3] = apint_words[0]; apint_words = swapped_words; } - return reinterpret_cast(apint_words); + return static_cast(apint_words); case e_sint512: case e_uint512: apint_words = m_integer.getRawData(); @@ -158,13 +158,13 @@ swapped_words[7] = apint_words[0]; apint_words = swapped_words; } - return reinterpret_cast(apint_words); + return static_cast(apint_words); case e_float: flt_val = m_float.convertToFloat(); - return reinterpret_cast(&flt_val); + return static_cast(&flt_val); case e_double: dbl_val = m_float.convertToDouble(); - return reinterpret_cast(&dbl_val); + return static_cast(&dbl_val); case e_long_double: llvm::APInt ldbl_val = m_float.bitcastToAPInt(); apint_words = ldbl_val.getRawData(); @@ -176,7 +176,7 @@ swapped_words[1] = apint_words[0]; apint_words = swapped_words; } - return reinterpret_cast(apint_words); + return static_cast(apint_words); } return nullptr; } diff --git a/lldb/source/Utility/StreamString.cpp b/lldb/source/Utility/StreamString.cpp --- a/lldb/source/Utility/StreamString.cpp +++ b/lldb/source/Utility/StreamString.cpp @@ -24,7 +24,7 @@ } size_t StreamString::WriteImpl(const void *s, size_t length) { - m_packet.append(reinterpret_cast(s), length); + m_packet.append(static_cast(s), length); return length; } diff --git a/lldb/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp b/lldb/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp --- a/lldb/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp +++ b/lldb/tools/debugserver/source/MacOSX/DarwinLog/DarwinLogCollector.cpp @@ -690,9 +690,10 @@ if (!m_activity_stream) return; - DNBLogThreadedIf(LOG_DARWIN_LOG, "DarwinLogCollector::%s(): canceling " - "activity stream %p", - __FUNCTION__, reinterpret_cast(m_activity_stream)); + DNBLogThreadedIf(LOG_DARWIN_LOG, + "DarwinLogCollector::%s(): canceling " + "activity stream %p", + __FUNCTION__, static_cast(m_activity_stream)); (*s_os_activity_stream_cancel)(m_activity_stream); m_activity_stream = nullptr; } diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm --- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm +++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm @@ -1413,29 +1413,29 @@ bool MachProcess::Signal(int signal, const struct timespec *timeout_abstime) { DNBLogThreadedIf(LOG_PROCESS, "MachProcess::Signal (signal = %d, timeout = %p)", signal, - reinterpret_cast(timeout_abstime)); + static_cast(timeout_abstime)); nub_state_t state = GetState(); if (::kill(ProcessID(), signal) == 0) { // If we were running and we have a timeout, wait for the signal to stop if (IsRunning(state) && timeout_abstime) { - DNBLogThreadedIf(LOG_PROCESS, "MachProcess::Signal (signal = %d, timeout " - "= %p) waiting for signal to stop " - "process...", - signal, reinterpret_cast(timeout_abstime)); + DNBLogThreadedIf(LOG_PROCESS, + "MachProcess::Signal (signal = %d, timeout " + "= %p) waiting for signal to stop " + "process...", + signal, static_cast(timeout_abstime)); m_private_events.WaitForSetEvents(eEventProcessStoppedStateChanged, timeout_abstime); state = GetState(); DNBLogThreadedIf( LOG_PROCESS, "MachProcess::Signal (signal = %d, timeout = %p) state = %s", signal, - reinterpret_cast(timeout_abstime), - DNBStateAsString(state)); + static_cast(timeout_abstime), DNBStateAsString(state)); return !IsRunning(state); } DNBLogThreadedIf( LOG_PROCESS, "MachProcess::Signal (signal = %d, timeout = %p) not waiting...", - signal, reinterpret_cast(timeout_abstime)); + signal, static_cast(timeout_abstime)); return true; } DNBError err(errno, DNBError::POSIX); @@ -1739,10 +1739,10 @@ bp = m_breakpoints.Add(addr, length, hardware); if (EnableBreakpoint(addr)) { - DNBLogThreadedIf(LOG_BREAKPOINTS, "MachProcess::CreateBreakpoint ( addr = " - "0x%8.8llx, length = %llu) => %p", - (uint64_t)addr, (uint64_t)length, - reinterpret_cast(bp)); + DNBLogThreadedIf(LOG_BREAKPOINTS, + "MachProcess::CreateBreakpoint ( addr = " + "0x%8.8llx, length = %llu) => %p", + (uint64_t)addr, (uint64_t)length, static_cast(bp)); return bp; } else if (bp->Release() == 0) { m_breakpoints.Remove(addr); @@ -1771,10 +1771,10 @@ wp->SetIsWatchpoint(watch_flags); if (EnableWatchpoint(addr)) { - DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = " - "0x%8.8llx, length = %llu) => %p", - (uint64_t)addr, (uint64_t)length, - reinterpret_cast(wp)); + DNBLogThreadedIf(LOG_WATCHPOINTS, + "MachProcess::CreateWatchpoint ( addr = " + "0x%8.8llx, length = %llu) => %p", + (uint64_t)addr, (uint64_t)length, static_cast(wp)); return wp; } else { DNBLogThreadedIf(LOG_WATCHPOINTS, "MachProcess::CreateWatchpoint ( addr = " @@ -2303,7 +2303,7 @@ size_t MachProcess::GetAvailableSTDOUT(char *buf, size_t buf_size) { DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (&%p[%llu]) ...", __FUNCTION__, - reinterpret_cast(buf), (uint64_t)buf_size); + static_cast(buf), (uint64_t)buf_size); PTHREAD_MUTEX_LOCKER(locker, m_stdio_mutex); size_t bytes_available = m_stdout_data.size(); if (bytes_available > 0) { @@ -2463,7 +2463,7 @@ size_t MachProcess::GetAsyncProfileData(char *buf, size_t buf_size) { DNBLogThreadedIf(LOG_PROCESS, "MachProcess::%s (&%p[%llu]) ...", __FUNCTION__, - reinterpret_cast(buf), (uint64_t)buf_size); + static_cast(buf), (uint64_t)buf_size); PTHREAD_MUTEX_LOCKER(locker, m_profile_data_mutex); if (m_profile_data.empty()) return 0; @@ -2995,8 +2995,8 @@ DNBLogThreadedIf(LOG_PROCESS, "%s( path = '%s', argv = %p, envp = %p, " "launch_flavor = %u, disable_aslr = %d )", - __FUNCTION__, path, reinterpret_cast(argv), - reinterpret_cast(envp), launch_flavor, + __FUNCTION__, path, static_cast(argv), + static_cast(envp), launch_flavor, disable_aslr); // Fork a child process for debugging @@ -3138,11 +3138,12 @@ MachProcess *process, int disable_aslr, DNBError &err) { posix_spawnattr_t attr; short flags; - DNBLogThreadedIf(LOG_PROCESS, "%s ( path='%s', argv=%p, envp=%p, " - "working_dir=%s, stdin=%s, stdout=%s " - "stderr=%s, no-stdio=%i)", - __FUNCTION__, path, reinterpret_cast(argv), - reinterpret_cast(envp), working_directory, + DNBLogThreadedIf(LOG_PROCESS, + "%s ( path='%s', argv=%p, envp=%p, " + "working_dir=%s, stdin=%s, stdout=%s " + "stderr=%s, no-stdio=%i)", + __FUNCTION__, path, static_cast(argv), + static_cast(envp), working_directory, stdin_path, stdout_path, stderr_path, no_stdio); err.SetError(::posix_spawnattr_init(&attr), DNBError::POSIX); diff --git a/lldb/tools/debugserver/source/MacOSX/MachThread.cpp b/lldb/tools/debugserver/source/MacOSX/MachThread.cpp --- a/lldb/tools/debugserver/source/MacOSX/MachThread.cpp +++ b/lldb/tools/debugserver/source/MacOSX/MachThread.cpp @@ -49,7 +49,7 @@ DNBLogThreadedIf(LOG_THREAD | LOG_VERBOSE, "MachThread::MachThread ( process = %p, tid = 0x%8.8" PRIx64 ", seq_id = %u )", - reinterpret_cast(&m_process), m_unique_id, m_seq_id); + static_cast(&m_process), m_unique_id, m_seq_id); } MachThread::~MachThread() {