From f41464618f41b92cf0a0bd14ccc57bce727fb33d Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 14 May 2003 12:11:51 +0000 Subject: [PATCH] Fix major problem with appending linkage changes git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6185 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkModules.cpp | 3 ++- lib/Transforms/Utils/Linker.cpp | 3 ++- lib/VMCore/Linker.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -597,7 +597,8 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Add all of the appending globals already in the Dest module to // AppendingVars. for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) - AppendingVars.insert(std::make_pair(I->getName(), I)); + if (I->hasAppendingLinkage()) + AppendingVars.insert(std::make_pair(I->getName(), I)); // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over). diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -597,7 +597,8 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Add all of the appending globals already in the Dest module to // AppendingVars. for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) - AppendingVars.insert(std::make_pair(I->getName(), I)); + if (I->hasAppendingLinkage()) + AppendingVars.insert(std::make_pair(I->getName(), I)); // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over). diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/lib/VMCore/Linker.cpp +++ b/lib/VMCore/Linker.cpp @@ -597,7 +597,8 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Add all of the appending globals already in the Dest module to // AppendingVars. for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) - AppendingVars.insert(std::make_pair(I->getName(), I)); + if (I->hasAppendingLinkage()) + AppendingVars.insert(std::make_pair(I->getName(), I)); // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over).