From: Lang Hames <lhames@gmail.com>
Date: Fri, 27 Jan 2012 23:52:25 +0000 (+0000)
Subject: Silence warning about parens for && within ||
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f8d3c7d72367244e56efd9ce2c64ef5905cb377;p=oota-llvm.git

Silence warning about parens for && within ||

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149152 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index a233a12267b..c491d49a969 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -935,7 +935,7 @@ static void handleMoveUses(const MachineBasicBlock *mbb,
 void LiveIntervals::moveInstr(MachineBasicBlock::iterator insertPt,
                               MachineInstr *mi) {
   MachineBasicBlock* mbb = mi->getParent();
-  assert(insertPt == mbb->end() || insertPt->getParent() == mbb &&
+  assert((insertPt == mbb->end() || insertPt->getParent() == mbb) &&
          "Cannot handle moves across basic block boundaries.");
   assert(&*insertPt != mi && "No-op move requested?");
   assert(!mi->isInsideBundle() && "Can't handle bundled instructions yet.");