From bc327c6bd32f37b453405bf8383a46dcae6f4e14 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Fri, 2 May 2014 21:28:49 +0000
Subject: [PATCH] =?UTF-8?q?Satisfy=20GCC's=20urgent=20need=20for=20parenth?=
 =?UTF-8?q?eses=20around=20=E2=80=98&&=E2=80=99=20within=20=E2=80=98||?=
 =?UTF-8?q?=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

llvm-svn: 207871
---
 lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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())