fixathon created this revision.
fixathon added reviewers: clayborg, aadsm, jingham, JDevlieghere.
Herald added a project: All.
fixathon requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
Remove redundant code that can never execute due to preceeding logic checks in
the code.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D130929
Files:
lldb/source/API/SBFrame.cpp
lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
lldb/source/Target/Platform.cpp
Index: lldb/source/Target/Platform.cpp
===================================================================
--- lldb/source/Target/Platform.cpp
+++ lldb/source/Target/Platform.cpp
@@ -1773,25 +1773,21 @@
error.Clear();
if (!target) {
- ArchSpec arch;
- if (target && target->GetArchitecture().IsValid())
- arch = target->GetArchitecture();
- else
- arch = Target::GetDefaultArchitecture();
+ ArchSpec arch = Target::GetDefaultArchitecture();
- const char *triple = "";
- if (arch.IsValid())
- triple = arch.GetTriple().getTriple().c_str();
+ const char *triple =
+ arch.IsValid() ? arch.GetTriple().getTriple().c_str() : "";
TargetSP new_target_sp;
error = debugger.GetTargetList().CreateTarget(
debugger, "", triple, eLoadDependentsNo, nullptr, new_target_sp);
+
target = new_target_sp.get();
+ if (!target || error.Fail()) {
+ return nullptr;
+ }
}
- if (!target || error.Fail())
- return nullptr;
-
lldb::ProcessSP process_sp =
target->CreateProcess(debugger.GetListener(), plugin_name, nullptr,
true);
Index: lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
===================================================================
--- lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
+++ lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
@@ -65,9 +65,6 @@
return true;
}
- if (timescale == 0)
- return false;
-
switch (timescale) {
case 0:
return false;
Index: lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
+++ lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
@@ -582,9 +582,6 @@
++NGRN;
}
- if (reg_info == nullptr)
- return false;
-
const lldb::addr_t value_addr =
reg_ctx->ReadRegisterAsUnsigned(reg_info, LLDB_INVALID_ADDRESS);
Index: lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
+++ lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
@@ -612,9 +612,6 @@
++NGRN;
}
- if (reg_info == nullptr)
- return false;
-
const lldb::addr_t value_addr =
reg_ctx->ReadRegisterAsUnsigned(reg_info, LLDB_INVALID_ADDRESS);
Index: lldb/source/API/SBFrame.cpp
===================================================================
--- lldb/source/API/SBFrame.cpp
+++ lldb/source/API/SBFrame.cpp
@@ -739,7 +739,7 @@
lldb::DynamicValueType use_dynamic =
frame->CalculateTarget()->GetPreferDynamicValue();
const bool include_runtime_support_values =
- target ? target->GetDisplayRuntimeSupportValues() : false;
+ target->GetDisplayRuntimeSupportValues();
SBVariablesOptions options;
options.SetIncludeArguments(arguments);
Index: lldb/source/Target/Platform.cpp
===================================================================
--- lldb/source/Target/Platform.cpp
+++ lldb/source/Target/Platform.cpp
@@ -1773,25 +1773,21 @@
error.Clear();
if (!target) {
- ArchSpec arch;
- if (target && target->GetArchitecture().IsValid())
- arch = target->GetArchitecture();
- else
- arch = Target::GetDefaultArchitecture();
+ ArchSpec arch = Target::GetDefaultArchitecture();
- const char *triple = "";
- if (arch.IsValid())
- triple = arch.GetTriple().getTriple().c_str();
+ const char *triple =
+ arch.IsValid() ? arch.GetTriple().getTriple().c_str() : "";
TargetSP new_target_sp;
error = debugger.GetTargetList().CreateTarget(
debugger, "", triple, eLoadDependentsNo, nullptr, new_target_sp);
+
target = new_target_sp.get();
+ if (!target || error.Fail()) {
+ return nullptr;
+ }
}
- if (!target || error.Fail())
- return nullptr;
-
lldb::ProcessSP process_sp =
target->CreateProcess(debugger.GetListener(), plugin_name, nullptr, true);
Index: lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
===================================================================
--- lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
+++ lldb/source/Plugins/Language/ObjC/CoreMedia.cpp
@@ -65,9 +65,6 @@
return true;
}
- if (timescale == 0)
- return false;
-
switch (timescale) {
case 0:
return false;
Index: lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
+++ lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
@@ -582,9 +582,6 @@
++NGRN;
}
- if (reg_info == nullptr)
- return false;
-
const lldb::addr_t value_addr =
reg_ctx->ReadRegisterAsUnsigned(reg_info, LLDB_INVALID_ADDRESS);
Index: lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
===================================================================
--- lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
+++ lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
@@ -612,9 +612,6 @@
++NGRN;
}
- if (reg_info == nullptr)
- return false;
-
const lldb::addr_t value_addr =
reg_ctx->ReadRegisterAsUnsigned(reg_info, LLDB_INVALID_ADDRESS);
Index: lldb/source/API/SBFrame.cpp
===================================================================
--- lldb/source/API/SBFrame.cpp
+++ lldb/source/API/SBFrame.cpp
@@ -739,7 +739,7 @@
lldb::DynamicValueType use_dynamic =
frame->CalculateTarget()->GetPreferDynamicValue();
const bool include_runtime_support_values =
- target ? target->GetDisplayRuntimeSupportValues() : false;
+ target->GetDisplayRuntimeSupportValues();
SBVariablesOptions options;
options.SetIncludeArguments(arguments);
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
