3 files changed, 8 insertions, 13 deletions
diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
index 310eb79de87..a6249b3a286 100644
--- a/lldb/source/Expression/DWARFExpression.cpp
+++ b/lldb/source/Expression/DWARFExpression.cpp
@@ -1839,7 +1839,7 @@ bool DWARFExpression::Evaluate(
           error_ptr->SetErrorString(
               "Expression stack needs at least 1 item for DW_OP_abs.");
         return false;
-      } else if (stack.back().ResolveValue(exe_ctx).AbsoluteValue() == false) {
+      } else if (!stack.back().ResolveValue(exe_ctx).AbsoluteValue()) {
         if (error_ptr)
           error_ptr->SetErrorString(
               "Failed to take the absolute value of the first stack item.");
@@ -1972,7 +1972,7 @@ bool DWARFExpression::Evaluate(
               "Expression stack needs at least 1 item for DW_OP_neg.");
         return false;
       } else {
-        if (stack.back().ResolveValue(exe_ctx).UnaryNegate() == false) {
+        if (!stack.back().ResolveValue(exe_ctx).UnaryNegate()) {
           if (error_ptr)
             error_ptr->SetErrorString("Unary negate failed.");
           return false;
@@ -1993,7 +1993,7 @@ bool DWARFExpression::Evaluate(
               "Expression stack needs at least 1 item for DW_OP_not.");
         return false;
       } else {
-        if (stack.back().ResolveValue(exe_ctx).OnesComplement() == false) {
+        if (!stack.back().ResolveValue(exe_ctx).OnesComplement()) {
           if (error_ptr)
             error_ptr->SetErrorString("Logical NOT failed.");
           return false;
@@ -2100,8 +2100,8 @@ bool DWARFExpression::Evaluate(
       } else {
         tmp = stack.back();
         stack.pop_back();
-        if (stack.back().ResolveValue(exe_ctx).ShiftRightLogical(
-                tmp.ResolveValue(exe_ctx)) == false) {
+        if (!stack.back().ResolveValue(exe_ctx).ShiftRightLogical(
+                tmp.ResolveValue(exe_ctx))) {
           if (error_ptr)
             error_ptr->SetErrorString("DW_OP_shr failed.");
           return false;
diff --git a/lldb/source/Expression/ExpressionSourceCode.cpp b/lldb/source/Expression/ExpressionSourceCode.cpp
index abbb332fac4..03b2d26a256 100644
--- a/lldb/source/Expression/ExpressionSourceCode.cpp
+++ b/lldb/source/Expression/ExpressionSourceCode.cpp
@@ -105,10 +105,7 @@ public:
       if (m_file_stack.back() != m_current_file)
         return true;
 
-      if (line >= m_current_file_line)
-        return false;
-      else
-        return true;
+      return line < m_current_file_line;
     default:
       return false;
     }
@@ -378,7 +375,5 @@ bool ExpressionSourceCode::GetOriginalBodyBounds(
     return false;
   start_loc += strlen(start_marker);
   end_loc = transformed_text.find(end_marker);
-  if (end_loc == std::string::npos)
-    return false;
-  return true;
+  return end_loc != std::string::npos;
 }
diff --git a/lldb/source/Expression/Materializer.cpp b/lldb/source/Expression/Materializer.cpp
index 0b6bf522b0b..f92eb64895e 100644
--- a/lldb/source/Expression/Materializer.cpp
+++ b/lldb/source/Expression/Materializer.cpp
@@ -528,7 +528,7 @@ public:
 
         if (data.GetByteSize() < m_variable_sp->GetType()->GetByteSize()) {
           if (data.GetByteSize() == 0 &&
-              m_variable_sp->LocationExpression().IsValid() == false) {
+              !m_variable_sp->LocationExpression().IsValid()) {
             err.SetErrorStringWithFormat("the variable '%s' has no location, "
                                          "it may have been optimized out",
                                          m_variable_sp->GetName().AsCString());