[llvm-commits] CVS: llvm/lib/Transforms/IPO/FunctionResolution.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/IPO:

FunctionResolution.cpp updated: 1.34 -> 1.35

---
Log message:

Unless we CANNOT merge the arguments, do so


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.34 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.35
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.34	Wed Aug 13 17:15:04 2003
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp	Wed Aug 20 18:50:38 2003
@@ -69,7 +69,9 @@
             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