Skip to content

Commit

Permalink
[lldb][NFC] Use static_cast instead of reinterpret_cast where possible
Browse files Browse the repository at this point in the history
Summary: There are a few places in LLDB where we do a `reinterpret_cast` for conversions that we could also do with `static_cast`. This patch moves all this code to `static_cast`.

Reviewers: shafik, JDevlieghere, labath

Reviewed By: labath

Subscribers: arphaman, usaxena95, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D72161
  • Loading branch information
Teemperor committed Jan 7, 2020
1 parent 14cd4a5 commit 65fdb34
Show file tree
Hide file tree
Showing 16 changed files with 67 additions and 69 deletions.
2 changes: 1 addition & 1 deletion lldb/source/API/SBEvent.cpp
Expand Up @@ -175,7 +175,7 @@ const char *SBEvent::GetCStringFromEvent(const SBEvent &event) {
LLDB_RECORD_STATIC_METHOD(const char *, SBEvent, GetCStringFromEvent,
(const lldb::SBEvent &), event);

return reinterpret_cast<const char *>(
return static_cast<const char *>(
EventDataBytes::GetBytesFromEvent(event.get()));
}

Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Core/Debugger.cpp
Expand Up @@ -1456,7 +1456,7 @@ void Debugger::DefaultEventHandler() {
done = true;
} else if (event_type &
CommandInterpreter::eBroadcastBitAsynchronousErrorData) {
const char *data = reinterpret_cast<const char *>(
const char *data = static_cast<const char *>(
EventDataBytes::GetBytesFromEvent(event_sp.get()));
if (data && data[0]) {
StreamSP error_sp(GetAsyncErrorStream());
Expand All @@ -1467,7 +1467,7 @@ void Debugger::DefaultEventHandler() {
}
} else if (event_type & CommandInterpreter::
eBroadcastBitAsynchronousOutputData) {
const char *data = reinterpret_cast<const char *>(
const char *data = static_cast<const char *>(
EventDataBytes::GetBytesFromEvent(event_sp.get()));
if (data && data[0]) {
StreamSP output_sp(GetAsyncOutputStream());
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Host/common/NativeProcessProtocol.cpp
Expand Up @@ -682,7 +682,7 @@ NativeProcessProtocol::ReadCStringFromMemory(lldb::addr_t addr, char *buffer,
addr_t cache_line_bytes_left =
cache_line_size - (curr_addr % cache_line_size);
addr_t bytes_to_read = std::min<addr_t>(bytes_left, cache_line_bytes_left);
status = ReadMemory(curr_addr, reinterpret_cast<void *>(curr_buffer),
status = ReadMemory(curr_addr, static_cast<void *>(curr_buffer),
bytes_to_read, bytes_read);

if (bytes_read == 0)
Expand All @@ -691,7 +691,7 @@ NativeProcessProtocol::ReadCStringFromMemory(lldb::addr_t addr, char *buffer,
void *str_end = std::memchr(curr_buffer, '\0', bytes_read);
if (str_end != nullptr) {
total_bytes_read =
(size_t)(reinterpret_cast<char *>(str_end) - buffer + 1);
static_cast<size_t>((static_cast<char *>(str_end) - buffer + 1));
status.Clear();
break;
}
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Host/macosx/objcxx/Host.mm
Expand Up @@ -1013,7 +1013,7 @@ static bool AddPosixSpawnFileAction(void *_file_actions, const FileAction *info,
return false;

posix_spawn_file_actions_t *file_actions =
reinterpret_cast<posix_spawn_file_actions_t *>(_file_actions);
static_cast<posix_spawn_file_actions_t *>(_file_actions);

switch (info->GetAction()) {
case FileAction::eFileActionNone:
Expand Down Expand Up @@ -1447,7 +1447,7 @@ static bool ShouldLaunchUsingXPC(ProcessLaunchInfo &launch_info) {
"(callback, pid=%i, monitor_signals=%i) "
"source = %p\n",
static_cast<int>(pid), monitor_signals,
reinterpret_cast<void *>(source));
static_cast<void *>(source));

if (source) {
Host::MonitorChildProcessCallback callback_copy = callback;
Expand Down
9 changes: 4 additions & 5 deletions lldb/source/Host/posix/PipePosix.cpp
Expand Up @@ -270,8 +270,8 @@ Status PipePosix::ReadWithTimeout(void *buf, size_t size,
while (error.Success()) {
error = select_helper.Select();
if (error.Success()) {
auto result = ::read(fd, reinterpret_cast<char *>(buf) + bytes_read,
size - bytes_read);
auto result =
::read(fd, static_cast<char *>(buf) + bytes_read, size - bytes_read);
if (result != -1) {
bytes_read += result;
if (bytes_read == size || result == 0)
Expand Down Expand Up @@ -301,9 +301,8 @@ Status PipePosix::Write(const void *buf, size_t size, size_t &bytes_written) {
while (error.Success()) {
error = select_helper.Select();
if (error.Success()) {
auto result =
::write(fd, reinterpret_cast<const char *>(buf) + bytes_written,
size - bytes_written);
auto result = ::write(fd, static_cast<const char *>(buf) + bytes_written,
size - bytes_written);
if (result != -1) {
bytes_written += result;
if (bytes_written == size)
Expand Down
Expand Up @@ -388,8 +388,7 @@ bool ASTResultSynthesizer::SynthesizeBodyResult(CompoundStmt *Body,
// replace the old statement with the new one
//

*last_stmt_ptr =
reinterpret_cast<Stmt *>(result_initialization_stmt_result.get());
*last_stmt_ptr = static_cast<Stmt *>(result_initialization_stmt_result.get());

return true;
}
Expand Down
Expand Up @@ -22,8 +22,7 @@ uint32_t ClangDeclVendor::FindDecls(ConstString name, bool append,
std::vector<CompilerDecl> compiler_decls;
uint32_t ret = FindDecls(name, /*append*/ false, max_matches, compiler_decls);
for (CompilerDecl compiler_decl : compiler_decls) {
clang::Decl *d =
reinterpret_cast<clang::Decl *>(compiler_decl.GetOpaqueDecl());
clang::Decl *d = static_cast<clang::Decl *>(compiler_decl.GetOpaqueDecl());
clang::NamedDecl *nd = llvm::cast<clang::NamedDecl>(d);
decls.push_back(nd);
}
Expand Down
Expand Up @@ -2013,7 +2013,7 @@ GDBRemoteCommunicationServerLLGS::Handle_p(StringExtractorGDBRemote &packet) {
}

const uint8_t *const data =
reinterpret_cast<const uint8_t *>(reg_value.GetBytes());
static_cast<const uint8_t *>(reg_value.GetBytes());
if (!data) {
LLDB_LOGF(log,
"GDBRemoteCommunicationServerLLGS::%s failed to get data "
Expand Down
18 changes: 9 additions & 9 deletions lldb/source/Target/Target.cpp
Expand Up @@ -3978,14 +3978,14 @@ void TargetProperties::SetRequireHardwareBreakpoints(bool b) {
void TargetProperties::Arg0ValueChangedCallback(void *target_property_ptr,
OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
this_->m_launch_info.SetArg0(this_->GetArg0());
}

void TargetProperties::RunArgsValueChangedCallback(void *target_property_ptr,
OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
Args args;
if (this_->GetRunArguments(args))
this_->m_launch_info.GetArguments() = args;
Expand All @@ -3994,38 +3994,38 @@ void TargetProperties::RunArgsValueChangedCallback(void *target_property_ptr,
void TargetProperties::EnvVarsValueChangedCallback(void *target_property_ptr,
OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
this_->m_launch_info.GetEnvironment() = this_->GetEnvironment();
}

void TargetProperties::InputPathValueChangedCallback(void *target_property_ptr,
OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
this_->m_launch_info.AppendOpenFileAction(
STDIN_FILENO, this_->GetStandardInputPath(), true, false);
}

void TargetProperties::OutputPathValueChangedCallback(void *target_property_ptr,
OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
this_->m_launch_info.AppendOpenFileAction(
STDOUT_FILENO, this_->GetStandardOutputPath(), false, true);
}

void TargetProperties::ErrorPathValueChangedCallback(void *target_property_ptr,
OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
this_->m_launch_info.AppendOpenFileAction(
STDERR_FILENO, this_->GetStandardErrorPath(), false, true);
}

void TargetProperties::DetachOnErrorValueChangedCallback(
void *target_property_ptr, OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
if (this_->GetDetachOnError())
this_->m_launch_info.GetFlags().Set(lldb::eLaunchFlagDetachOnError);
else
Expand All @@ -4035,7 +4035,7 @@ void TargetProperties::DetachOnErrorValueChangedCallback(
void TargetProperties::DisableASLRValueChangedCallback(
void *target_property_ptr, OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
if (this_->GetDisableASLR())
this_->m_launch_info.GetFlags().Set(lldb::eLaunchFlagDisableASLR);
else
Expand All @@ -4045,7 +4045,7 @@ void TargetProperties::DisableASLRValueChangedCallback(
void TargetProperties::DisableSTDIOValueChangedCallback(
void *target_property_ptr, OptionValue *) {
TargetProperties *this_ =
reinterpret_cast<TargetProperties *>(target_property_ptr);
static_cast<TargetProperties *>(target_property_ptr);
if (this_->GetDisableSTDIO())
this_->m_launch_info.GetFlags().Set(lldb::eLaunchFlagDisableSTDIO);
else
Expand Down
7 changes: 3 additions & 4 deletions lldb/source/Utility/DataExtractor.cpp
Expand Up @@ -129,9 +129,8 @@ DataExtractor::DataExtractor()
DataExtractor::DataExtractor(const void *data, offset_t length,
ByteOrder endian, uint32_t addr_size,
uint32_t target_byte_size /*=1*/)
: m_start(const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(data))),
m_end(const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(data)) +
length),
: m_start(const_cast<uint8_t *>(static_cast<const uint8_t *>(data))),
m_end(const_cast<uint8_t *>(static_cast<const uint8_t *>(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);
Expand Down Expand Up @@ -232,7 +231,7 @@ lldb::offset_t DataExtractor::SetData(const void *bytes, offset_t length,
m_start = nullptr;
m_end = nullptr;
} else {
m_start = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(bytes));
m_start = const_cast<uint8_t *>(static_cast<const uint8_t *>(bytes));
m_end = m_start + length;
}
return GetByteSize();
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Utility/Environment.cpp
Expand Up @@ -13,7 +13,7 @@ using namespace lldb_private;
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 *>(
char *Result = static_cast<char *>(
Allocator.Allocate(sizeof(char) * size, alignof(char)));
char *Next = Result;

Expand All @@ -26,7 +26,7 @@ char *Environment::Envp::make_entry(llvm::StringRef Key,
}

Environment::Envp::Envp(const Environment &Env) {
Data = reinterpret_cast<char **>(
Data = static_cast<char **>(
Allocator.Allocate(sizeof(char *) * (Env.size() + 1), alignof(char *)));
char **Next = Data;
for (const auto &KV : Env)
Expand Down
14 changes: 7 additions & 7 deletions lldb/source/Utility/Scalar.cpp
Expand Up @@ -74,7 +74,7 @@ Scalar::Scalar() : m_type(e_void), m_float(static_cast<float>(0)) {}
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<const uint8_t *>(GetBytes());
const uint8_t *bytes = static_cast<const uint8_t *>(GetBytes());

if (limit_byte_size < byte_size) {
if (endian::InlHostByteOrder() == eByteOrderLittle) {
Expand Down Expand Up @@ -132,7 +132,7 @@ const void *Scalar::GetBytes() const {
swapped_words[1] = apint_words[0];
apint_words = swapped_words;
}
return reinterpret_cast<const void *>(apint_words);
return static_cast<const void *>(apint_words);
case e_sint256:
case e_uint256:
apint_words = m_integer.getRawData();
Expand All @@ -143,7 +143,7 @@ const void *Scalar::GetBytes() const {
swapped_words[3] = apint_words[0];
apint_words = swapped_words;
}
return reinterpret_cast<const void *>(apint_words);
return static_cast<const void *>(apint_words);
case e_sint512:
case e_uint512:
apint_words = m_integer.getRawData();
Expand All @@ -158,13 +158,13 @@ const void *Scalar::GetBytes() const {
swapped_words[7] = apint_words[0];
apint_words = swapped_words;
}
return reinterpret_cast<const void *>(apint_words);
return static_cast<const void *>(apint_words);
case e_float:
flt_val = m_float.convertToFloat();
return reinterpret_cast<const void *>(&flt_val);
return static_cast<const void *>(&flt_val);
case e_double:
dbl_val = m_float.convertToDouble();
return reinterpret_cast<const void *>(&dbl_val);
return static_cast<const void *>(&dbl_val);
case e_long_double:
llvm::APInt ldbl_val = m_float.bitcastToAPInt();
apint_words = ldbl_val.getRawData();
Expand All @@ -176,7 +176,7 @@ const void *Scalar::GetBytes() const {
swapped_words[1] = apint_words[0];
apint_words = swapped_words;
}
return reinterpret_cast<const void *>(apint_words);
return static_cast<const void *>(apint_words);
}
return nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Utility/StreamString.cpp
Expand Up @@ -24,7 +24,7 @@ void StreamString::Flush() {
}

size_t StreamString::WriteImpl(const void *s, size_t length) {
m_packet.append(reinterpret_cast<const char *>(s), length);
m_packet.append(static_cast<const char *>(s), length);
return length;
}

Expand Down
Expand Up @@ -690,9 +690,10 @@ void DarwinLogCollector::CancelActivityStream() {
if (!m_activity_stream)
return;

DNBLogThreadedIf(LOG_DARWIN_LOG, "DarwinLogCollector::%s(): canceling "
"activity stream %p",
__FUNCTION__, reinterpret_cast<void *>(m_activity_stream));
DNBLogThreadedIf(LOG_DARWIN_LOG,
"DarwinLogCollector::%s(): canceling "
"activity stream %p",
__FUNCTION__, static_cast<void *>(m_activity_stream));
(*s_os_activity_stream_cancel)(m_activity_stream);
m_activity_stream = nullptr;
}

0 comments on commit 65fdb34

Please sign in to comment.