commit a6682a413d893bc1ed6190dfadcee806155da66e
author Jonas Devlieghere <jonas@devlieghere.com> Sat Dec 15 00:15:33 2018 +0000
committer Jonas Devlieghere <jonas@devlieghere.com> Sat Dec 15 00:15:33 2018 +0000
tree 326b3a6e484e3a3a3a5087663e1284f9b594f2a8
parent 9d1827331f3f9582fa2ed05913ae4301f2604a19

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

lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
index 1116624..f03c714 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
@@ -778,12 +778,9 @@
   StringRef name_string_ref = name.GetStringRef();
 
   // The ClangASTSource is not responsible for finding $-names.
-  if (name_string_ref.empty() ||
-      (ignore_all_dollar_names && name_string_ref.startswith("$")) ||
-      name_string_ref.startswith("_$"))
-    return true;
-
-  return false;
+  return name_string_ref.empty() ||
+         (ignore_all_dollar_names && name_string_ref.startswith("$")) ||
+         name_string_ref.startswith("_$");
 }
 
 void ClangASTSource::FindExternalVisibleDecls(

lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
index bc18d27..fde610a 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
@@ -778,11 +778,8 @@
 static bool IsObjCSelectorRef(Value *value) {
   GlobalVariable *global_variable = dyn_cast<GlobalVariable>(value);
 
-  if (!global_variable || !global_variable->hasName() ||
-      !global_variable->getName().startswith("OBJC_SELECTOR_REFERENCES_"))
-    return false;
-
-  return true;
+  return !(!global_variable || !global_variable->hasName() ||
+           !global_variable->getName().startswith("OBJC_SELECTOR_REFERENCES_"));
 }
 
 // This function does not report errors; its callers are responsible.
@@ -953,11 +950,8 @@
 static bool IsObjCClassReference(Value *value) {
   GlobalVariable *global_variable = dyn_cast<GlobalVariable>(value);
 
-  if (!global_variable || !global_variable->hasName() ||
-      !global_variable->getName().startswith("OBJC_CLASS_REFERENCES_"))
-    return false;
-
-  return true;
+  return !(!global_variable || !global_variable->hasName() ||
+           !global_variable->getName().startswith("OBJC_CLASS_REFERENCES_"));
 }
 
 // This function does not report errors; its callers are responsible.
@@ -1259,12 +1253,9 @@
         llvm::NextPowerOf2(constant_size) * 8);
 
     lldb_private::Status get_data_error;
-    if (!scalar.GetAsMemoryData(data, constant_size,
-                                lldb_private::endian::InlHostByteOrder(),
-                                get_data_error))
-      return false;
-
-    return true;
+    return scalar.GetAsMemoryData(data, constant_size,
+                                  lldb_private::endian::InlHostByteOrder(),
+                                  get_data_error) != 0;
   } else if (ConstantDataArray *array_initializer =
                  dyn_cast<ConstantDataArray>(initializer)) {
     if (array_initializer->isString()) {