From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Fri, 2 May 2014 21:28:49 +0000 (+0000)
Subject: Satisfy GCC's urgent need for parentheses around ‘&&’ within ‘||’.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=71aafce117e9d63b03bae301f7fdc66291877382;p=oota-llvm.git

Satisfy GCC's urgent need for parentheses around ‘&&’ within ‘||’.

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

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 7058c4e95ae..2c584350a79 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2924,8 +2924,8 @@ SDValue SelectionDAG::FoldConstantArithmetic(unsigned Opcode, EVT VT,
     }
   }
 
-  assert((Scalar1 && Scalar2) ||
-         VT.getVectorNumElements() == Outputs.size() && "No scalar or vector!");
+  assert((Scalar1 && Scalar2) || (VT.getVectorNumElements() == Outputs.size() &&
+                                  "Expected a scalar or vector!"));
 
   // Handle the scalar case first.
   if (!VT.isVector())