From: Denis Protivensky <dprotivensky@accesssoftek.com>
Date: Tue, 9 Jun 2015 09:28:37 +0000 (+0000)
Subject: MergeFunctions: Fix gcc warning in condition
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f9520411c65afb55612dfc2bf9827657963eed5;p=oota-llvm.git

MergeFunctions: Fix gcc warning in condition


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

diff --git a/lib/Transforms/IPO/MergeFunctions.cpp b/lib/Transforms/IPO/MergeFunctions.cpp
index 5acd8e248d8..052f1b4b132 100644
--- a/lib/Transforms/IPO/MergeFunctions.cpp
+++ b/lib/Transforms/IPO/MergeFunctions.cpp
@@ -1434,8 +1434,8 @@ void MergeFunctions::replaceFunctionInTree(FnTreeType::iterator &IterToF,
 
   // A total order is already guaranteed otherwise because we process strong
   // functions before weak functions.
-  assert((F->mayBeOverridden() && G->mayBeOverridden()) ||
-         (!F->mayBeOverridden() && !G->mayBeOverridden()) &&
+  assert(((F->mayBeOverridden() && G->mayBeOverridden()) ||
+          (!F->mayBeOverridden() && !G->mayBeOverridden())) &&
          "Only change functions if both are strong or both are weak");
   (void)F;