Fix message to make more sense and confuse Chris less

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

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index bd8ec8c9cef4002debc63999e64241be52782a53..0e7d887044da89d98aee28e25eca10c6033eb79a 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -463,11 +463,16 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
                    "' have different linkage specifiers!");
     } else if (SGV->hasExternalLinkage()) {
       // Allow linking two exactly identical external global variables...
-      if (SGV->isConstant() != DGV->isConstant() ||
-          SGV->getInitializer() != DGV->getInitializer())
+      if (SGV->isConstant() != DGV->isConstant())
         return Error(Err, "Global Variable Collision on '" + 
                      SGV->getType()->getDescription() + " %" + SGV->getName() +
                      "' - Global variables differ in const'ness");
+
+      if (SGV->getInitializer() != DGV->getInitializer())
+        return Error(Err, "Global Variable Collision on '" + 
+                     SGV->getType()->getDescription() + " %" + SGV->getName() +
+                    "' - External linkage globals have different initializers");
+
       ValueMap.insert(std::make_pair(SGV, DGV));
     } else if (SGV->hasLinkOnceLinkage()) {
       // If the global variable has a name, and that name is already in use in

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index bd8ec8c9cef4002debc63999e64241be52782a53..0e7d887044da89d98aee28e25eca10c6033eb79a 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -463,11 +463,16 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
                    "' have different linkage specifiers!");
     } else if (SGV->hasExternalLinkage()) {
       // Allow linking two exactly identical external global variables...
-      if (SGV->isConstant() != DGV->isConstant() ||
-          SGV->getInitializer() != DGV->getInitializer())
+      if (SGV->isConstant() != DGV->isConstant())
         return Error(Err, "Global Variable Collision on '" + 
                      SGV->getType()->getDescription() + " %" + SGV->getName() +
                      "' - Global variables differ in const'ness");
+
+      if (SGV->getInitializer() != DGV->getInitializer())
+        return Error(Err, "Global Variable Collision on '" + 
+                     SGV->getType()->getDescription() + " %" + SGV->getName() +
+                    "' - External linkage globals have different initializers");
+
       ValueMap.insert(std::make_pair(SGV, DGV));
     } else if (SGV->hasLinkOnceLinkage()) {
       // If the global variable has a name, and that name is already in use in

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index bd8ec8c9cef4002debc63999e64241be52782a53..0e7d887044da89d98aee28e25eca10c6033eb79a 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -463,11 +463,16 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
                    "' have different linkage specifiers!");
     } else if (SGV->hasExternalLinkage()) {
       // Allow linking two exactly identical external global variables...
-      if (SGV->isConstant() != DGV->isConstant() ||
-          SGV->getInitializer() != DGV->getInitializer())
+      if (SGV->isConstant() != DGV->isConstant())
         return Error(Err, "Global Variable Collision on '" + 
                      SGV->getType()->getDescription() + " %" + SGV->getName() +
                      "' - Global variables differ in const'ness");
+
+      if (SGV->getInitializer() != DGV->getInitializer())
+        return Error(Err, "Global Variable Collision on '" + 
+                     SGV->getType()->getDescription() + " %" + SGV->getName() +
+                    "' - External linkage globals have different initializers");
+
       ValueMap.insert(std::make_pair(SGV, DGV));
     } else if (SGV->hasLinkOnceLinkage()) {
       // If the global variable has a name, and that name is already in use in