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

d0k · d0k · commit 71aafce117e9 · 2014-05-02T21:28:49.000Z
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
@@ -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())

Original file line number	Diff line number	Diff line change
`@@ -2924,8 +2924,8 @@ SDValue SelectionDAG::FoldConstantArithmetic(unsigned Opcode, EVT VT,`
`2924`	`2924`	`}`
`2925`	`2925`	`}`
`2926`	`2926`
`2927`		`- assert((Scalar1 && Scalar2) \|\|`
`2928`		`- VT.getVectorNumElements() == Outputs.size() && "No scalar or vector!");`
	`2927`	`+ assert((Scalar1 && Scalar2) \|\| (VT.getVectorNumElements() == Outputs.size() &&`
	`2928`	`+ "Expected a scalar or vector!"));`
`2929`	`2929`
`2930`	`2930`	`// Handle the scalar case first.`
`2931`	`2931`	`if (!VT.isVector())`