commit 6dd9f8feb336b06b3d9077b17d88e899f1c622a9
author Benjamin Kramer <benny.kra@googlemail.com> Fri May 02 21:28:49 2014 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Fri May 02 21:28:49 2014 +0000
tree d01376bd2cd19d4ce7a72e8fb072d882f6de6bc5
parent b0f9e4ace7c21b66541ff15f526b413111406c63

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

llvm-svn: 207871

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 7058c4e..2c58435 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2924,8 +2924,8 @@
     }
   }
 
-  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())