diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-10-21 21:52:20 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-10-21 21:52:20 +0000 |
| commit | f85770c9a670dc5c360015125389c389ae9592c7 (patch) | |
| tree | 784a0d5b1c5805125ec8225852b7c8da50ed7df2 /lib/Transforms | |
| parent | db15798e2e6a0d307a5692b43f024e84a492b73b (diff) | |
| download | external_llvm-f85770c9a670dc5c360015125389c389ae9592c7.zip external_llvm-f85770c9a670dc5c360015125389c389ae9592c7.tar.gz external_llvm-f85770c9a670dc5c360015125389c389ae9592c7.tar.bz2 | |
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
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/Utils/Linker.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index bd8ec8c..0e7d887 100644 --- 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 |