6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-01 02:29:19 +00:00
Code Issues Projects Releases Wiki Activity

Make sure the const bit gets inherited correctly when linking declarations

Browse Source 
of disagreeing constness.  This fixes
test/Regression/Linker/ConstantGlobals[123].ll


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16692 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2004-10-05 02:28:11 +00:00
parent 5e4f2991a0
commit d4984cca0e
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Linker/LinkModules.cpp
View File

@ -457,15 +457,26 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
// external globals, we aren't adding anything.
ValueMap.insert(std::make_pair(SGV, DGV));
// Inherit 'const' information.
if (SGV->isConstant()) DGV->setConstant(true);
} else if (DGV->isExternal()) { // If DGV is external but SGV is not...
ValueMap.insert(std::make_pair(SGV, DGV));
DGV->setLinkage(SGV->getLinkage()); // Inherit linkage!
if (DGV->isConstant() && !SGV->isConstant())
return Error(Err, "Linking globals named '" + SGV->getName() +
"': declaration is const but definition is not!");
// Inherit 'const' information.
if (SGV->isConstant()) DGV->setConstant(true);
} else if (SGV->hasWeakLinkage() || SGV->hasLinkOnceLinkage()) {
// At this point we know that DGV has LinkOnce, Appending, Weak, or
// External linkage. If DGV is Appending, this is an error.
if (DGV->hasAppendingLinkage())
return Error(Err, "Linking globals named '" + SGV->getName() +
" ' with 'weak' and 'appending' linkage is not allowed!");
"' with 'weak' and 'appending' linkage is not allowed!");
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
@ -498,6 +509,9 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
} else if (SGV->getLinkage() != DGV->getLinkage()) {
return Error(Err, "Global variables named '" + SGV->getName() +
"' have different linkage specifiers!");
// Inherit 'const' information.
if (SGV->isConstant()) DGV->setConstant(true);
} else if (SGV->hasExternalLinkage()) {
// Allow linking two exactly identical external global variables...
if (SGV->isConstant() != DGV->isConstant())

16
lib/VMCore/Linker.cpp
View File

@ -457,15 +457,26 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
// external globals, we aren't adding anything.
ValueMap.insert(std::make_pair(SGV, DGV));
// Inherit 'const' information.
if (SGV->isConstant()) DGV->setConstant(true);
} else if (DGV->isExternal()) { // If DGV is external but SGV is not...
ValueMap.insert(std::make_pair(SGV, DGV));
DGV->setLinkage(SGV->getLinkage()); // Inherit linkage!
if (DGV->isConstant() && !SGV->isConstant())
return Error(Err, "Linking globals named '" + SGV->getName() +
"': declaration is const but definition is not!");
// Inherit 'const' information.
if (SGV->isConstant()) DGV->setConstant(true);
} else if (SGV->hasWeakLinkage() || SGV->hasLinkOnceLinkage()) {
// At this point we know that DGV has LinkOnce, Appending, Weak, or
// External linkage. If DGV is Appending, this is an error.
if (DGV->hasAppendingLinkage())
return Error(Err, "Linking globals named '" + SGV->getName() +
" ' with 'weak' and 'appending' linkage is not allowed!");
"' with 'weak' and 'appending' linkage is not allowed!");
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
@ -498,6 +509,9 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
} else if (SGV->getLinkage() != DGV->getLinkage()) {
return Error(Err, "Global variables named '" + SGV->getName() +
"' have different linkage specifiers!");
// Inherit 'const' information.
if (SGV->isConstant()) DGV->setConstant(true);
} else if (SGV->hasExternalLinkage()) {
// Allow linking two exactly identical external global variables...
if (SGV->isConstant() != DGV->isConstant())