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

Ensure that visibility and section are properly propagated.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33872 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2007-02-04 04:30:33 +00:00
parent 8bef0373f1
commit 471feac1b2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Linker/LinkModules.cpp
View File

@ -476,11 +476,10 @@ static bool LinkGlobals(Module *Dest, Module *Src,
new GlobalVariable(SGV->getType()->getElementType(), new GlobalVariable(SGV->getType()->getElementType(),
SGV->isConstant(), SGV->getLinkage(), /*init*/0, SGV->isConstant(), SGV->getLinkage(), /*init*/0,
SGV->getName(), Dest); SGV->getName(), Dest);
// Propagate alignment info. // Propagate alignment, visibility and section info.
NewDGV->setAlignment(SGV->getAlignment()); NewDGV->setAlignment(SGV->getAlignment());
// Propagate section info.
NewDGV->setSection(SGV->getSection()); NewDGV->setSection(SGV->getSection());
NewDGV->setVisibility(SGV->getVisibility());
// If the LLVM runtime renamed the global, but it is an externally visible // If the LLVM runtime renamed the global, but it is an externally visible
// symbol, DGV must be an existing global with internal linkage. Rename // symbol, DGV must be an existing global with internal linkage. Rename
@ -503,11 +502,10 @@ static bool LinkGlobals(Module *Dest, Module *Src,
SGV->isConstant(), SGV->getLinkage(), /*init*/0, SGV->isConstant(), SGV->getLinkage(), /*init*/0,
"", Dest); "", Dest);
// Propagate alignment info. // Propagate alignment, section and visibility info.
NewDGV->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment())); NewDGV->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment()));
// Propagate section info.
NewDGV->setSection(SGV->getSection()); NewDGV->setSection(SGV->getSection());
NewDGV->setVisibility(SGV->getVisibility());
// Make sure to remember this mapping... // Make sure to remember this mapping...
ValueMap.insert(std::make_pair(SGV, NewDGV)); ValueMap.insert(std::make_pair(SGV, NewDGV));
@ -515,11 +513,10 @@ static bool LinkGlobals(Module *Dest, Module *Src,
// Keep track that this is an appending variable... // Keep track that this is an appending variable...
AppendingVars.insert(std::make_pair(SGV->getName(), NewDGV)); AppendingVars.insert(std::make_pair(SGV->getName(), NewDGV));
} else { } else {
// Propagate alignment info. // Propagate alignment, section, and visibility info.
DGV->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment())); DGV->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment()));
// Propagate section info.
DGV->setSection(SGV->getSection()); DGV->setSection(SGV->getSection());
DGV->setVisibility(SGV->getVisibility());
// Otherwise, perform the mapping as instructed by GetLinkageResult. If // Otherwise, perform the mapping as instructed by GetLinkageResult. If
// the types don't match, and if we are to link from the source, nuke DGV // the types don't match, and if we are to link from the source, nuke DGV
@ -529,6 +526,8 @@ static bool LinkGlobals(Module *Dest, Module *Src,
new GlobalVariable(SGV->getType()->getElementType(), new GlobalVariable(SGV->getType()->getElementType(),
DGV->isConstant(), DGV->getLinkage()); DGV->isConstant(), DGV->getLinkage());
NewDGV->setAlignment(DGV->getAlignment()); NewDGV->setAlignment(DGV->getAlignment());
NewDGV->setSection(DGV->getSection());
NewDGV->setVisibility(DGV->getVisibility());
Dest->getGlobalList().insert(DGV, NewDGV); Dest->getGlobalList().insert(DGV, NewDGV);
DGV->replaceAllUsesWith( DGV->replaceAllUsesWith(
ConstantExpr::getBitCast(NewDGV, DGV->getType())); ConstantExpr::getBitCast(NewDGV, DGV->getType()));