Add some braces to make newer GCCs happy and update CMakeLists.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81443 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index 735e8a7..d233322 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -22,6 +22,7 @@
   LoopInfo.cpp
   LoopPass.cpp
   LoopVR.cpp
+  MallocHelper.cpp
   MemoryDependenceAnalysis.cpp
   PointerTracking.cpp
   PostDominators.cpp
diff --git a/lib/Analysis/MallocHelper.cpp b/lib/Analysis/MallocHelper.cpp
index 5001110..567268c 100644
--- a/lib/Analysis/MallocHelper.cpp
+++ b/lib/Analysis/MallocHelper.cpp
@@ -188,7 +188,7 @@
 
   Constant* CO = dyn_cast<Constant>(MallocArg);
   BinaryOperator* BO = dyn_cast<BinaryOperator>(MallocArg);
-  assert(isConstantOne(ElementSize) || CO || BO &&
+  assert((isConstantOne(ElementSize) || CO || BO) &&
          "getMallocArraySize and malformed malloc IR");
       
   if (isConstantOne(ElementSize))