[Lldb-commits] [lldb] ab0fa6c - [lldb] Fix else-after-return in Breakpoint (NFC)
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Wed Jul 2 12:07:25 PDT 2025
Author: Jonas Devlieghere
Date: 2025-07-02T12:07:20-07:00
New Revision: ab0fa6c5dc725ef6f839ac8cea9b3a41aa3a5b75
URL: https://github.com/llvm/llvm-project/commit/ab0fa6c5dc725ef6f839ac8cea9b3a41aa3a5b75
DIFF: https://github.com/llvm/llvm-project/commit/ab0fa6c5dc725ef6f839ac8cea9b3a41aa3a5b75.diff
LOG: [lldb] Fix else-after-return in Breakpoint (NFC)
The LLVM Coding Standards [1] discourages the use of 'else' or 'else if'
after something that interrupts control flow. Bulk fix all instances as
I'm working on this part of LLDB.
[1] https://llvm.org/docs/CodingStandards.html#don-t-use-else-after-a-return
Added:
Modified:
lldb/include/lldb/Breakpoint/BreakpointResolver.h
lldb/source/Breakpoint/Breakpoint.cpp
lldb/source/Breakpoint/BreakpointIDList.cpp
lldb/source/Breakpoint/BreakpointLocation.cpp
lldb/source/Breakpoint/BreakpointLocationList.cpp
lldb/source/Breakpoint/BreakpointOptions.cpp
lldb/source/Breakpoint/BreakpointResolverName.cpp
lldb/source/Breakpoint/Watchpoint.cpp
lldb/source/Breakpoint/WatchpointOptions.cpp
Removed:
################################################################################
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolver.h b/lldb/include/lldb/Breakpoint/BreakpointResolver.h
index a0b37c94ac2b4..52cd70e934e6d 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolver.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolver.h
@@ -148,8 +148,7 @@ class BreakpointResolver : public Searcher {
enum ResolverTy GetResolverTy() {
if (SubclassID > ResolverTy::LastKnownResolverType)
return ResolverTy::UnknownResolver;
- else
- return (enum ResolverTy)SubclassID;
+ return (enum ResolverTy)SubclassID;
}
const char *GetResolverName() { return ResolverTyToName(GetResolverTy()); }
diff --git a/lldb/source/Breakpoint/Breakpoint.cpp b/lldb/source/Breakpoint/Breakpoint.cpp
index 2ed0c9314e3e1..b308644825dad 100644
--- a/lldb/source/Breakpoint/Breakpoint.cpp
+++ b/lldb/source/Breakpoint/Breakpoint.cpp
@@ -347,8 +347,7 @@ void Breakpoint::SetThreadID(lldb::tid_t thread_id) {
lldb::tid_t Breakpoint::GetThreadID() const {
if (m_options.GetThreadSpecNoCreate() == nullptr)
return LLDB_INVALID_THREAD_ID;
- else
- return m_options.GetThreadSpecNoCreate()->GetTID();
+ return m_options.GetThreadSpecNoCreate()->GetTID();
}
void Breakpoint::SetThreadIndex(uint32_t index) {
@@ -362,8 +361,7 @@ void Breakpoint::SetThreadIndex(uint32_t index) {
uint32_t Breakpoint::GetThreadIndex() const {
if (m_options.GetThreadSpecNoCreate() == nullptr)
return 0;
- else
- return m_options.GetThreadSpecNoCreate()->GetIndex();
+ return m_options.GetThreadSpecNoCreate()->GetIndex();
}
void Breakpoint::SetThreadName(const char *thread_name) {
@@ -378,8 +376,7 @@ void Breakpoint::SetThreadName(const char *thread_name) {
const char *Breakpoint::GetThreadName() const {
if (m_options.GetThreadSpecNoCreate() == nullptr)
return nullptr;
- else
- return m_options.GetThreadSpecNoCreate()->GetName();
+ return m_options.GetThreadSpecNoCreate()->GetName();
}
void Breakpoint::SetQueueName(const char *queue_name) {
@@ -394,8 +391,7 @@ void Breakpoint::SetQueueName(const char *queue_name) {
const char *Breakpoint::GetQueueName() const {
if (m_options.GetThreadSpecNoCreate() == nullptr)
return nullptr;
- else
- return m_options.GetThreadSpecNoCreate()->GetQueueName();
+ return m_options.GetThreadSpecNoCreate()->GetQueueName();
}
void Breakpoint::SetCondition(const char *condition) {
@@ -851,8 +847,8 @@ void Breakpoint::GetDescription(Stream *s, lldb::DescriptionLevel level,
if (level == eDescriptionLevelBrief) {
s->PutCString(GetBreakpointKind());
return;
- } else
- s->Printf("Kind: %s\n", GetBreakpointKind());
+ }
+ s->Printf("Kind: %s\n", GetBreakpointKind());
}
const size_t num_locations = GetNumLocations();
@@ -1085,8 +1081,7 @@ Breakpoint::BreakpointEventData::GetBreakpointEventTypeFromEvent(
if (data == nullptr)
return eBreakpointEventTypeInvalidType;
- else
- return data->GetBreakpointEventType();
+ return data->GetBreakpointEventType();
}
BreakpointSP Breakpoint::BreakpointEventData::GetBreakpointFromEvent(
diff --git a/lldb/source/Breakpoint/BreakpointIDList.cpp b/lldb/source/Breakpoint/BreakpointIDList.cpp
index 5fc9f95a75db1..8dde2c31e64a2 100644
--- a/lldb/source/Breakpoint/BreakpointIDList.cpp
+++ b/lldb/source/Breakpoint/BreakpointIDList.cpp
@@ -99,8 +99,8 @@ llvm::Error BreakpointIDList::FindAndReplaceIDRanges(
new_args.Clear();
return llvm::createStringError(llvm::inconvertibleErrorCode(),
error.AsCString());
- } else
- names_found.insert(std::string(current_arg));
+ }
+ names_found.insert(std::string(current_arg));
} else if ((i + 2 < old_args.size()) &&
BreakpointID::IsRangeIdentifier(old_args[i + 1].ref()) &&
BreakpointID::IsValidIDExpression(current_arg) &&
diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp
index c7ea50407ae1c..2a00c94eac7e7 100644
--- a/lldb/source/Breakpoint/BreakpointLocation.cpp
+++ b/lldb/source/Breakpoint/BreakpointLocation.cpp
@@ -55,8 +55,7 @@ const BreakpointOptions &BreakpointLocation::GetOptionsSpecifyingKind(
BreakpointOptions::OptionKind kind) const {
if (m_options_up && m_options_up->IsOptionSet(kind))
return *m_options_up;
- else
- return m_owner.GetOptions();
+ return m_owner.GetOptions();
}
Address &BreakpointLocation::GetAddress() { return m_address; }
@@ -68,10 +67,9 @@ Target &BreakpointLocation::GetTarget() { return m_owner.GetTarget(); }
bool BreakpointLocation::IsEnabled() const {
if (!m_owner.IsEnabled())
return false;
- else if (m_options_up != nullptr)
+ if (m_options_up != nullptr)
return m_options_up->IsEnabled();
- else
- return true;
+ return true;
}
void BreakpointLocation::SetEnabled(bool enabled) {
@@ -89,8 +87,7 @@ bool BreakpointLocation::IsAutoContinue() const {
if (m_options_up &&
m_options_up->IsOptionSet(BreakpointOptions::eAutoContinue))
return m_options_up->IsAutoContinue();
- else
- return m_owner.IsAutoContinue();
+ return m_owner.IsAutoContinue();
}
void BreakpointLocation::SetAutoContinue(bool auto_continue) {
@@ -109,8 +106,7 @@ lldb::tid_t BreakpointLocation::GetThreadID() {
.GetThreadSpecNoCreate();
if (thread_spec)
return thread_spec->GetTID();
- else
- return LLDB_INVALID_THREAD_ID;
+ return LLDB_INVALID_THREAD_ID;
}
void BreakpointLocation::SetThreadIndex(uint32_t index) {
@@ -131,8 +127,7 @@ uint32_t BreakpointLocation::GetThreadIndex() const {
.GetThreadSpecNoCreate();
if (thread_spec)
return thread_spec->GetIndex();
- else
- return 0;
+ return 0;
}
void BreakpointLocation::SetThreadName(const char *thread_name) {
@@ -153,8 +148,7 @@ const char *BreakpointLocation::GetThreadName() const {
.GetThreadSpecNoCreate();
if (thread_spec)
return thread_spec->GetName();
- else
- return nullptr;
+ return nullptr;
}
void BreakpointLocation::SetQueueName(const char *queue_name) {
@@ -175,22 +169,19 @@ const char *BreakpointLocation::GetQueueName() const {
.GetThreadSpecNoCreate();
if (thread_spec)
return thread_spec->GetQueueName();
- else
- return nullptr;
+ return nullptr;
}
bool BreakpointLocation::InvokeCallback(StoppointCallbackContext *context) {
if (m_options_up != nullptr && m_options_up->HasCallback())
return m_options_up->InvokeCallback(context, m_owner.GetID(), GetID());
- else
- return m_owner.InvokeCallback(context, GetID());
+ return m_owner.InvokeCallback(context, GetID());
}
bool BreakpointLocation::IsCallbackSynchronous() {
if (m_options_up != nullptr && m_options_up->HasCallback())
return m_options_up->IsCallbackSynchronous();
- else
- return m_owner.GetOptions().IsCallbackSynchronous();
+ return m_owner.GetOptions().IsCallbackSynchronous();
}
void BreakpointLocation::SetCallback(BreakpointHitCallback callback,
diff --git a/lldb/source/Breakpoint/BreakpointLocationList.cpp b/lldb/source/Breakpoint/BreakpointLocationList.cpp
index 0240305d6f292..0631a02438ec2 100644
--- a/lldb/source/Breakpoint/BreakpointLocationList.cpp
+++ b/lldb/source/Breakpoint/BreakpointLocationList.cpp
@@ -72,8 +72,7 @@ BreakpointLocationList::FindByID(lldb::break_id_t break_id) const {
llvm::lower_bound(m_locations, break_id, Compare);
if (pos != end && (*pos)->GetID() == break_id)
return *(pos);
- else
- return BreakpointLocationSP();
+ return BreakpointLocationSP();
}
size_t BreakpointLocationList::FindInModule(
diff --git a/lldb/source/Breakpoint/BreakpointOptions.cpp b/lldb/source/Breakpoint/BreakpointOptions.cpp
index 242b5b30168c5..2151c4c2dd204 100644
--- a/lldb/source/Breakpoint/BreakpointOptions.cpp
+++ b/lldb/source/Breakpoint/BreakpointOptions.cpp
@@ -438,7 +438,8 @@ bool BreakpointOptions::InvokeCallback(StoppointCallbackContext *context,
return m_callback(m_callback_baton_sp ? m_callback_baton_sp->data()
: nullptr,
context, break_id, break_loc_id);
- } else if (IsCallbackSynchronous()) {
+ }
+ if (IsCallbackSynchronous()) {
return false;
}
}
@@ -482,9 +483,8 @@ const char *BreakpointOptions::GetConditionText(size_t *hash) const {
*hash = m_condition_text_hash;
return m_condition_text.c_str();
- } else {
- return nullptr;
}
+ return nullptr;
}
const ThreadSpec *BreakpointOptions::GetThreadSpecNoCreate() const {
diff --git a/lldb/source/Breakpoint/BreakpointResolverName.cpp b/lldb/source/Breakpoint/BreakpointResolverName.cpp
index b9c8a1635d844..edde1c91b789c 100644
--- a/lldb/source/Breakpoint/BreakpointResolverName.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolverName.cpp
@@ -124,14 +124,14 @@ BreakpointResolverSP BreakpointResolverName::CreateFromStructuredData(
return std::make_shared<BreakpointResolverName>(
nullptr, RegularExpression(regex_text), language, offset,
skip_prologue);
- } else {
- StructuredData::Array *names_array;
- success = options_dict.GetValueForKeyAsArray(
- GetKey(OptionNames::SymbolNameArray), names_array);
- if (!success) {
- error = Status::FromErrorString("BRN::CFSD: Missing symbol names entry.");
- return nullptr;
- }
+ }
+ StructuredData::Array *names_array;
+ success = options_dict.GetValueForKeyAsArray(
+ GetKey(OptionNames::SymbolNameArray), names_array);
+ if (!success) {
+ error = Status::FromErrorString("BRN::CFSD: Missing symbol names entry.");
+ return nullptr;
+ }
StructuredData::Array *names_mask_array;
success = options_dict.GetValueForKeyAsArray(
GetKey(OptionNames::NameMaskArray), names_mask_array);
@@ -182,7 +182,6 @@ BreakpointResolverSP BreakpointResolverName::CreateFromStructuredData(
resolver_sp->AddNameLookup(ConstString(names[i]), name_masks[i]);
}
return resolver_sp;
- }
}
StructuredData::ObjectSP BreakpointResolverName::SerializeToStructuredData() {
diff --git a/lldb/source/Breakpoint/Watchpoint.cpp b/lldb/source/Breakpoint/Watchpoint.cpp
index 2df848aaa0576..f1366ca538075 100644
--- a/lldb/source/Breakpoint/Watchpoint.cpp
+++ b/lldb/source/Breakpoint/Watchpoint.cpp
@@ -477,8 +477,7 @@ void Watchpoint::SetCondition(const char *condition) {
const char *Watchpoint::GetConditionText() const {
if (m_condition_up)
return m_condition_up->GetUserText();
- else
- return nullptr;
+ return nullptr;
}
void Watchpoint::SendWatchpointChangedEvent(
@@ -534,8 +533,7 @@ Watchpoint::WatchpointEventData::GetWatchpointEventTypeFromEvent(
if (data == nullptr)
return eWatchpointEventTypeInvalidType;
- else
- return data->GetWatchpointEventType();
+ return data->GetWatchpointEventType();
}
WatchpointSP Watchpoint::WatchpointEventData::GetWatchpointFromEvent(
diff --git a/lldb/source/Breakpoint/WatchpointOptions.cpp b/lldb/source/Breakpoint/WatchpointOptions.cpp
index c27cd62e02206..321aab0700195 100644
--- a/lldb/source/Breakpoint/WatchpointOptions.cpp
+++ b/lldb/source/Breakpoint/WatchpointOptions.cpp
@@ -92,8 +92,8 @@ bool WatchpointOptions::InvokeCallback(StoppointCallbackContext *context,
return m_callback(m_callback_baton_sp ? m_callback_baton_sp->data()
: nullptr,
context, watch_id);
- } else
- return true;
+ }
+ return true;
}
bool WatchpointOptions::HasCallback() {
More information about the lldb-commits
mailing list