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

[Chris Lattner]

Changes in directory llvm/lib/Transforms/IPO:

FunctionResolution.cpp updated: 1.35 -> 1.36

---
Log message:

Fix bug: FunctionResolve/2003-08-23-ArgumentWarning.ll


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.35 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.36
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.35	Wed Aug 20 18:50:38 2003
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp	Sat Aug 23 15:03:05 2003
@@ -65,14 +65,14 @@
 
       if (!Old->use_empty() && !Concrete->use_empty())
         for (unsigned i = 0; i < NumArguments; ++i)
-          if (OldMT->getParamTypes()[i] != ConcreteMT->getParamTypes()[i]) {
-            std::cerr << "WARNING: Function [" << Old->getName()
-                      << "]: Parameter types conflict for: '" << OldMT
-                      << "' and '" << ConcreteMT << "'\n";
+          if (OldMT->getParamTypes()[i] != ConcreteMT->getParamTypes()[i])
             if (OldMT->getParamTypes()[i]->getPrimitiveID() != 
-                ConcreteMT->getParamTypes()[i]->getPrimitiveID())
+                ConcreteMT->getParamTypes()[i]->getPrimitiveID()) {
+              std::cerr << "WARNING: Function [" << Old->getName()
+                        << "]: Parameter types conflict for: '" << OldMT
+                        << "' and '" << ConcreteMT << "'\n";
               return Changed;
-          }
+            }
       
       // Attempt to convert all of the uses of the old function to the concrete
       // form of the function.  If there is a use of the fn that we don't