Simplify Boolean expressions

This patch simplifies boolean expressions acorss LLDB. It was generated
using clang-tidy with the following command:

run-clang-tidy.py -checks='-*,readability-simplify-boolean-expr' -format -fix $PWD

Differential revision: https://reviews.llvm.org/D55584

llvm-svn: 349215

6 files changed, 26 insertions, 39 deletions

diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
index 551f038fa20..024f82800f6 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -387,8 +387,8 @@ DynamicLoaderDarwinKernel::ReadMachHeader(addr_t addr, Process *process, llvm::M
     if (::memcmp (&header.magic, &magicks[i], sizeof (uint32_t)) == 0)
         found_matching_pattern = true;
 
-  if (found_matching_pattern == false)
-      return false;
+  if (!found_matching_pattern)
+    return false;
 
   if (header.magic == llvm::MachO::MH_CIGAM ||
       header.magic == llvm::MachO::MH_CIGAM_64) {
@@ -424,7 +424,7 @@ DynamicLoaderDarwinKernel::CheckForKernelImageAtAddress(lldb::addr_t addr,
 
   llvm::MachO::mach_header header;
 
-  if (ReadMachHeader (addr, process, header) == false)
+  if (!ReadMachHeader(addr, process, header))
     return UUID();
 
   // First try a quick test -- read the first 4 bytes and see if there is a
@@ -604,16 +604,10 @@ void DynamicLoaderDarwinKernel::KextImageInfo::SetProcessStopId(
 bool DynamicLoaderDarwinKernel::KextImageInfo::
 operator==(const KextImageInfo &rhs) {
   if (m_uuid.IsValid() || rhs.GetUUID().IsValid()) {
-    if (m_uuid == rhs.GetUUID()) {
-      return true;
-    }
-    return false;
+    return m_uuid == rhs.GetUUID();
   }
 
-  if (m_name == rhs.GetName() && m_load_address == rhs.GetLoadAddress())
-    return true;
-
-  return false;
+  return m_name == rhs.GetName() && m_load_address == rhs.GetLoadAddress();
 }
 
 void DynamicLoaderDarwinKernel::KextImageInfo::SetName(const char *name) {
@@ -731,7 +725,7 @@ bool DynamicLoaderDarwinKernel::KextImageInfo::ReadMemoryModule(
 }
 
 bool DynamicLoaderDarwinKernel::KextImageInfo::IsKernel() const {
-  return m_kernel_image == true;
+  return m_kernel_image;
 }
 
 void DynamicLoaderDarwinKernel::KextImageInfo::SetIsKernel(bool is_kernel) {
@@ -1280,7 +1274,7 @@ bool DynamicLoaderDarwinKernel::ParseKextSummaries(
 
     const uint32_t num_of_new_kexts = kext_summaries.size();
     for (uint32_t new_kext = 0; new_kext < num_of_new_kexts; new_kext++) {
-      if (to_be_added[new_kext] == true) {
+      if (to_be_added[new_kext]) {
         KextImageInfo &image_info = kext_summaries[new_kext];
         if (load_kexts) {
           if (!image_info.LoadImageUsingMemoryModule(m_process)) {
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
index 595e8484d20..944be9633e0 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
@@ -359,16 +359,18 @@ bool DynamicLoaderDarwin::JSONImageInformationIntoImageInfo(
     if (image_sp.get() == nullptr || image_sp->GetAsDictionary() == nullptr)
       return false;
     StructuredData::Dictionary *image = image_sp->GetAsDictionary();
-    if (image->HasKey("load_address") == false ||
-        image->HasKey("pathname") == false ||
-        image->HasKey("mod_date") == false ||
-        image->HasKey("mach_header") == false ||
+    // clang-format off
+    if (!image->HasKey("load_address") ||
+        !image->HasKey("pathname") ||
+        !image->HasKey("mod_date") ||
+        !image->HasKey("mach_header") ||
         image->GetValueForKey("mach_header")->GetAsDictionary() == nullptr ||
-        image->HasKey("segments") == false ||
+        !image->HasKey("segments") ||
         image->GetValueForKey("segments")->GetAsArray() == nullptr ||
-        image->HasKey("uuid") == false) {
+        !image->HasKey("uuid")) {
       return false;
     }
+    // clang-format on
     image_infos[i].address =
         image->GetValueForKey("load_address")->GetAsInteger()->GetValue();
     image_infos[i].mod_date =
@@ -712,11 +714,7 @@ bool DynamicLoaderDarwin::AlwaysRelyOnEHUnwindInfo(SymbolContext &sym_ctx) {
     return false;
 
   ObjCLanguageRuntime *objc_runtime = m_process->GetObjCLanguageRuntime();
-  if (objc_runtime != NULL && objc_runtime->IsModuleObjCLibrary(module_sp)) {
-    return true;
-  }
-
-  return false;
+  return objc_runtime != NULL && objc_runtime->IsModuleObjCLibrary(module_sp);
 }
 
 //----------------------------------------------------------------------
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
index 7fd886cdeae..1ff0ec2c793 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
@@ -65,7 +65,7 @@ DynamicLoader *DynamicLoaderMacOS::CreateInstance(Process *process,
     }
   }
 
-  if (UseDYLDSPI(process) == false) {
+  if (!UseDYLDSPI(process)) {
     create = false;
   }
 
@@ -503,8 +503,7 @@ bool DynamicLoaderMacOS::GetSharedCacheInformation(
           info_dict->GetValueForKey("shared_cache_uuid")->GetStringValue();
       if (!uuid_str.empty())
         uuid.SetFromStringRef(uuid_str);
-      if (info_dict->GetValueForKey("no_shared_cache")->GetBooleanValue() ==
-          false)
+      if (!info_dict->GetValueForKey("no_shared_cache")->GetBooleanValue())
         using_shared_cache = eLazyBoolYes;
       else
         using_shared_cache = eLazyBoolNo;
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
index 50ed1eff8ca..ec459a783f9 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
@@ -85,7 +85,7 @@ DynamicLoader *DynamicLoaderMacOSXDYLD::CreateInstance(Process *process,
     }
   }
 
-  if (UseDYLDSPI(process) == true) {
+  if (UseDYLDSPI(process)) {
     create = false;
   }
 
@@ -122,12 +122,12 @@ bool DynamicLoaderMacOSXDYLD::ProcessDidExec() {
       // value differs from the Process' image info address. When a process
       // execs itself it might cause a change if ASLR is enabled.
       const addr_t shlib_addr = m_process->GetImageInfoAddress();
-      if (m_process_image_addr_is_all_images_infos == true &&
+      if (m_process_image_addr_is_all_images_infos &&
           shlib_addr != m_dyld_all_image_infos_addr) {
         // The image info address from the process is the
         // 'dyld_all_image_infos' address and it has changed.
         did_exec = true;
-      } else if (m_process_image_addr_is_all_images_infos == false &&
+      } else if (!m_process_image_addr_is_all_images_infos &&
                  shlib_addr == m_dyld.address) {
         // The image info address from the process is the mach_header address
         // for dyld and it has changed.
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
index 68eb3389e91..b30a1ab2cf1 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
@@ -455,14 +455,10 @@ static bool isLoadBiasIncorrect(Target &target, const std::string &file_path) {
   // On Android L (API 21, 22) the load address of the "/system/bin/linker"
   // isn't filled in correctly.
   unsigned os_major = target.GetPlatform()->GetOSVersion().getMajor();
-  if (target.GetArchitecture().GetTriple().isAndroid() &&
-      (os_major == 21 || os_major == 22) &&
-      (file_path == "/system/bin/linker" ||
-       file_path == "/system/bin/linker64")) {
-    return true;
-  }
-
-  return false;
+  return target.GetArchitecture().GetTriple().isAndroid() &&
+         (os_major == 21 || os_major == 22) &&
+         (file_path == "/system/bin/linker" ||
+          file_path == "/system/bin/linker64");
 }
 
 void DYLDRendezvous::UpdateBaseAddrIfNecessary(SOEntry &entry,
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
index 72ef71e2f3b..660bba65d8b 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
@@ -117,7 +117,7 @@ void DynamicLoaderPOSIXDYLD::DidAttach() {
   EvalSpecialModulesStatus();
 
   // if we dont have a load address we cant re-base
-  bool rebase_exec = (load_offset == LLDB_INVALID_ADDRESS) ? false : true;
+  bool rebase_exec = load_offset != LLDB_INVALID_ADDRESS;
 
   // if we have a valid executable
   if (executable_sp.get()) {