summaryrefslogtreecommitdiff
path: root/lib/CodeGen/SelectionDAG
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2014-05-02 21:28:49 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2014-05-02 21:28:49 +0000
commit71aafce117e9d63b03bae301f7fdc66291877382 (patch)
treed63b46c429e57c644f89cb9f0e6e519fbbd2b699 /lib/CodeGen/SelectionDAG
parentd036fefe3406541fd5d06fd07338693dd51e559b (diff)
downloadllvm-71aafce117e9d63b03bae301f7fdc66291877382.tar.gz
llvm-71aafce117e9d63b03bae301f7fdc66291877382.tar.bz2
llvm-71aafce117e9d63b03bae301f7fdc66291877382.tar.xz
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
Diffstat (limited to 'lib/CodeGen/SelectionDAG')
-rw-r--r--lib/CodeGen/SelectionDAG/SelectionDAG.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 7058c4e95a..2c584350a7 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())