From: Chris Lattner <sabre@nondot.org>
Date: Wed, 20 Aug 2003 23:50:38 +0000 (+0000)
Subject: Unless we CANNOT merge the arguments, do so
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b29170fa40897a9b946557f7b7448661e5f78fdf;p=oota-llvm.git

Unless we CANNOT merge the arguments, do so


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

diff --git a/lib/Transforms/IPO/FunctionResolution.cpp b/lib/Transforms/IPO/FunctionResolution.cpp
index e4bfcb91141..7d609814530 100644
--- a/lib/Transforms/IPO/FunctionResolution.cpp
+++ b/lib/Transforms/IPO/FunctionResolution.cpp
@@ -69,7 +69,9 @@ static bool ResolveFunctions(Module &M, std::vector<GlobalValue*> &Globals,
             std::cerr << "WARNING: Function [" << Old->getName()
                       << "]: Parameter types conflict for: '" << OldMT
                       << "' and '" << ConcreteMT << "'\n";
-            return Changed;
+            if (OldMT->getParamTypes()[i]->getPrimitiveID() != 
+                ConcreteMT->getParamTypes()[i]->getPrimitiveID())
+              return Changed;
           }
       
       // Attempt to convert all of the uses of the old function to the concrete