commit 5ff6747e04021d52f4ed654fe82007be14b8267b
author Benjamin Kramer <benny.kra@googlemail.com> Mon Apr 11 08:26:13 2016 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Mon Apr 11 08:26:13 2016 +0000
tree 7b73549557867928227215f498a8fa0a5b4dc26f
parent 85eda12d093714bfc9f266d50254e82888c9e8c3

Remove redundant conditions of the form (A || (!A && B)) -> (A || B)

Found by cppcheck! PR27286 PR27287 PR27288 PR27289

llvm-svn: 265918

clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp

diff --git a/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
index c663ccc..8076ca0 100644
--- a/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
@@ -582,8 +582,7 @@
     // If InvalidationMethod is present, we are processing the message send and
     // should ensure we are invalidating with the appropriate method,
     // otherwise, we are processing setting to 'nil'.
-    if (!InvalidationMethod ||
-        (InvalidationMethod && I->second.hasMethod(InvalidationMethod)))
+    if (!InvalidationMethod || I->second.hasMethod(InvalidationMethod))
       IVars.erase(I);
   }
 }