From b29170fa40897a9b946557f7b7448661e5f78fdf Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 20 Aug 2003 23:50:38 +0000 Subject: [PATCH] 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 --- lib/Transforms/IPO/FunctionResolution.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 &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 -- 2.34.1