[llvm] r265987 - Fix a couple of redundant conditional expressions (PR27283, PR28282)

[Hans Wennborg via llvm-commits]

Author: hans
Date: Mon Apr 11 15:35:01 2016
New Revision: 265987

URL: http://llvm.org/viewvc/llvm-project?rev=265987&view=rev
Log:
Fix a couple of redundant conditional expressions (PR27283, PR28282)

Modified:
    llvm/trunk/lib/CodeGen/StackMaps.cpp
    llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp

Modified: llvm/trunk/lib/CodeGen/StackMaps.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackMaps.cpp?rev=265987&r1=265986&r2=265987&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/StackMaps.cpp (original)
+++ llvm/trunk/lib/CodeGen/StackMaps.cpp Mon Apr 11 15:35:01 2016
@@ -520,9 +520,9 @@ void StackMaps::emitCallsiteEntries(MCSt
 void StackMaps::serializeToStackMapSection() {
   (void)WSMP;
   // Bail out if there's no stack map data.
-  assert((!CSInfos.empty() || (CSInfos.empty() && ConstPool.empty())) &&
+  assert((!CSInfos.empty() || ConstPool.empty()) &&
          "Expected empty constant pool too!");
-  assert((!CSInfos.empty() || (CSInfos.empty() && FnStackSize.empty())) &&
+  assert((!CSInfos.empty() || FnStackSize.empty()) &&
          "Expected empty function record too!");
   if (CSInfos.empty())
     return;

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=265987&r1=265986&r2=265987&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Mon Apr 11 15:35:01 2016
@@ -5076,7 +5076,7 @@ bool SimplifyCFGOpt::SimplifyUncondBranc
   // in the back-end.)
   BasicBlock::iterator I = BB->getFirstNonPHIOrDbg()->getIterator();
   if (I->isTerminator() && BB != &BB->getParent()->getEntryBlock() &&
-      (!LoopHeaders || (LoopHeaders && !LoopHeaders->count(BB))) &&
+      (!LoopHeaders || !LoopHeaders->count(BB)) &&
       TryToSimplifyUncondBranchFromEmptyBlock(BB))
     return true;