maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Allow globals to be of different const'nesses when we link. 

This finally resolves PR502, PR450,
and test/Regression/Linker/2005-02-12-ConstantGlobals{,-2}.ll correctly

llvm-svn: 20135
This commit is contained in:
Chris Lattner 2005-02-12 19:20:28 +00:00
parent 36f3eb82a1
commit 16277c1775
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/Linker/LinkModules.cpp
View File

@ -517,18 +517,12 @@ static bool LinkGlobals(Module *Dest, Module *Src,
DGV->setLinkage(NewLinkage); DGV->setLinkage(NewLinkage);
if (LinkFromSrc) { if (LinkFromSrc) {
if (DGV->isConstant() && !SGV->isConstant())
return Error(Err, "Global Variable Collision on global '" +
SGV->getName() + "': variables differ in const'ness");
// Inherit const as appropriate // Inherit const as appropriate
if (SGV->isConstant()) DGV->setConstant(true); DGV->setConstant(SGV->isConstant());
DGV->setInitializer(0); DGV->setInitializer(0);
} else { } else {
if (SGV->isConstant() && !DGV->isConstant()) { if (SGV->isConstant() && !DGV->isConstant()) {
if (!DGV->isExternal()) if (DGV->isExternal())
return Error(Err, "Global Variable Collision on global '" +
SGV->getName() + "': variables differ in const'ness");
else
DGV->setConstant(true); DGV->setConstant(true);
} }
SGV->setLinkage(GlobalValue::ExternalLinkage); SGV->setLinkage(GlobalValue::ExternalLinkage);