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 e4bfcb91141f6e71537fff398b69facdaf4b3985..7d60981453060157c7871207c575a0d15540a602 100644 (file)
--- 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