Fix bug: Linker/2003-10-21-ConflictingTypesTolerance.ll

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

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 0e7d887044da89d98aee28e25eca10c6033eb79a..1d002c5821be688e732e3f60389eaa5a64e0bae1 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -215,20 +215,17 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
       }
 
       // If we STILL cannot resolve the types, then there is something wrong.
-      // Report the error.
+      // Report the warning and delete one of the names.
       if (DelayedTypesToResolve.size() == OldSize) {
-        // Build up an error message of all of the mismatched types.
-        std::string ErrorMessage;
-        for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
-          const std::string &Name = DelayedTypesToResolve[i];
-          const Type *T1 = cast<Type>(VM.find(Name)->second);
-          const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
-          ErrorMessage += "  Type named '" + Name + 
-                          "' conflicts.\n    Src='" + T1->getDescription() +
-                          "'.\n   Dest='" + T2->getDescription() + "'\n";
-        }
-        return Error(Err, "Type conflict between types in modules:\n" +
-                     ErrorMessage);
+        const std::string &Name = DelayedTypesToResolve.back();
+        
+        const Type *T1 = cast<Type>(VM.find(Name)->second);
+        const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
+        std::cerr << "WARNING: Type conflict between types named '" << Name
+                  <<  "'.\n    Src='" << *T1 << "'.\n   Dest='" << *T2 << "'\n";
+
+        // Remove the symbol name from the destination.
+        DelayedTypesToResolve.pop_back();
       }
     }
   }

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index 0e7d887044da89d98aee28e25eca10c6033eb79a..1d002c5821be688e732e3f60389eaa5a64e0bae1 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -215,20 +215,17 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
       }
 
       // If we STILL cannot resolve the types, then there is something wrong.
-      // Report the error.
+      // Report the warning and delete one of the names.
       if (DelayedTypesToResolve.size() == OldSize) {
-        // Build up an error message of all of the mismatched types.
-        std::string ErrorMessage;
-        for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
-          const std::string &Name = DelayedTypesToResolve[i];
-          const Type *T1 = cast<Type>(VM.find(Name)->second);
-          const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
-          ErrorMessage += "  Type named '" + Name + 
-                          "' conflicts.\n    Src='" + T1->getDescription() +
-                          "'.\n   Dest='" + T2->getDescription() + "'\n";
-        }
-        return Error(Err, "Type conflict between types in modules:\n" +
-                     ErrorMessage);
+        const std::string &Name = DelayedTypesToResolve.back();
+        
+        const Type *T1 = cast<Type>(VM.find(Name)->second);
+        const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
+        std::cerr << "WARNING: Type conflict between types named '" << Name
+                  <<  "'.\n    Src='" << *T1 << "'.\n   Dest='" << *T2 << "'\n";
+
+        // Remove the symbol name from the destination.
+        DelayedTypesToResolve.pop_back();
       }
     }
   }

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index 0e7d887044da89d98aee28e25eca10c6033eb79a..1d002c5821be688e732e3f60389eaa5a64e0bae1 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -215,20 +215,17 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
       }
 
       // If we STILL cannot resolve the types, then there is something wrong.
-      // Report the error.
+      // Report the warning and delete one of the names.
       if (DelayedTypesToResolve.size() == OldSize) {
-        // Build up an error message of all of the mismatched types.
-        std::string ErrorMessage;
-        for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
-          const std::string &Name = DelayedTypesToResolve[i];
-          const Type *T1 = cast<Type>(VM.find(Name)->second);
-          const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
-          ErrorMessage += "  Type named '" + Name + 
-                          "' conflicts.\n    Src='" + T1->getDescription() +
-                          "'.\n   Dest='" + T2->getDescription() + "'\n";
-        }
-        return Error(Err, "Type conflict between types in modules:\n" +
-                     ErrorMessage);
+        const std::string &Name = DelayedTypesToResolve.back();
+        
+        const Type *T1 = cast<Type>(VM.find(Name)->second);
+        const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
+        std::cerr << "WARNING: Type conflict between types named '" << Name
+                  <<  "'.\n    Src='" << *T1 << "'.\n   Dest='" << *T2 << "'\n";
+
+        // Remove the symbol name from the destination.
+        DelayedTypesToResolve.pop_back();
       }
     }
   }