From: Richard Osborne <richard@xmos.com>
Date: Fri, 7 Nov 2008 11:21:09 +0000 (+0000)
Subject: Fix compile warnings.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f943b1586f9964c88ae6431c09887e7c7917e449;p=oota-llvm.git

Fix compile warnings.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58840 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/XCore/XCoreAsmPrinter.cpp b/lib/Target/XCore/XCoreAsmPrinter.cpp
index 519b38bdfa9..edd70468b41 100644
--- a/lib/Target/XCore/XCoreAsmPrinter.cpp
+++ b/lib/Target/XCore/XCoreAsmPrinter.cpp
@@ -147,9 +147,9 @@ emitExternDirective(const std::string &name)
 void XCoreAsmPrinter::
 emitArrayBound(const std::string &name, const GlobalVariable *GV)
 {
-  assert((GV->hasExternalLinkage() ||
+  assert(((GV->hasExternalLinkage() ||
     GV->hasWeakLinkage()) ||
-    GV->hasLinkOnceLinkage() && "Unexpected linkage");
+    GV->hasLinkOnceLinkage()) && "Unexpected linkage");
   if (const ArrayType *ATy = dyn_cast<ArrayType>(
     cast<PointerType>(GV->getType())->getElementType()))
   {
diff --git a/lib/Target/XCore/XCoreISelDAGToDAG.cpp b/lib/Target/XCore/XCoreISelDAGToDAG.cpp
index 338f98e3853..28b501de7dd 100644
--- a/lib/Target/XCore/XCoreISelDAGToDAG.cpp
+++ b/lib/Target/XCore/XCoreISelDAGToDAG.cpp
@@ -83,7 +83,7 @@ FunctionPass *llvm::createXCoreISelDag(XCoreTargetMachine &TM) {
 bool XCoreDAGToDAGISel::SelectADDRspii(SDValue Op, SDValue Addr,
                                   SDValue &Base, SDValue &Offset) {
   FrameIndexSDNode *FIN = 0;
-  if (FIN = dyn_cast<FrameIndexSDNode>(Addr)) {
+  if ((FIN = dyn_cast<FrameIndexSDNode>(Addr))) {
     Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i32);
     Offset = CurDAG->getTargetConstant(0, MVT::i32);
     return true;