RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

Small cleanup on how we clear constant variables. NFC.

Browse Source 
llvm-svn: 223474
This commit is contained in:
Rafael Espindola 2014-12-05 16:05:19 +00:00
parent 00d129cc80
commit c114e956ae
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Linker/LinkModules.cpp
View File

@ -1045,6 +1045,14 @@ bool ModuleLinker::linkGlobalValueProto(GlobalValue *SGV) {
NewGO->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment()));
}
if (auto *NewGVar = dyn_cast<GlobalVariable>(NewGV)) {
auto *DGVar = dyn_cast_or_null<GlobalVariable>(DGV);
auto *SGVar = dyn_cast<GlobalVariable>(SGV);
if (DGVar && SGVar && DGVar->isDeclaration() && SGVar->isDeclaration() &&
(!DGVar->isConstant() || !SGVar->isConstant()))
NewGVar->setConstant(false);
}
// Make sure to remember this mapping.
if (NewGV != DGV) {
if (DGV) {
@ -1062,21 +1070,8 @@ bool ModuleLinker::linkGlobalValueProto(GlobalValue *SGV) {
GlobalValue *ModuleLinker::linkGlobalVariableProto(const GlobalVariable *SGVar,
GlobalValue *DGV,
bool LinkFromSrc) {
bool ClearConstant = false;
if (DGV) {
auto *DGVar = dyn_cast<GlobalVariable>(DGV);
if (!SGVar->isConstant() || (DGVar && !DGVar->isConstant()))
ClearConstant = true;
}
if (!LinkFromSrc) {
if (auto *NewGVar = dyn_cast<GlobalVariable>(DGV)) {
if (NewGVar->isDeclaration() && ClearConstant)
NewGVar->setConstant(false);
}
if (!LinkFromSrc)
return DGV;
}
// No linking to be performed or linking from the source: simply create an
// identical version of the symbol over in the dest module... the