summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
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
commit6dd9f8feb336b06b3d9077b17d88e899f1c622a9 (patch)
treed01376bd2cd19d4ce7a72e8fb072d882f6de6bc5 /llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
parentb0f9e4ace7c21b66541ff15f526b413111406c63 (diff)
downloadbcm5719-llvm-6dd9f8feb336b06b3d9077b17d88e899f1c622a9.tar.gz
bcm5719-llvm-6dd9f8feb336b06b3d9077b17d88e899f1c622a9.zip
Satisfy GCC's urgent need for parentheses around ‘&&’ within ‘||’.
llvm-svn: 207871
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 7058c4e95ae..2c584350a79 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/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())
OpenPOWER on IntegriCloud