RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge duplicated code.

Browse Source 
The code for deleting dead global variables and functions was
duplicated.

This is in preparation for also deleting dead global aliases.

llvm-svn: 256274
This commit is contained in:
Rafael Espindola 2015-12-22 19:38:07 +00:00
parent 36fd3caea4
commit 2af3ff098d
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Transforms/IPO/GlobalOpt.cpp
View File

@ -55,7 +55,6 @@ STATISTIC(NumSRA , "Number of aggregate globals broken into scalars");
STATISTIC(NumHeapSRA , "Number of heap objects SRA'd"); STATISTIC(NumHeapSRA , "Number of heap objects SRA'd");
STATISTIC(NumSubstitute,"Number of globals with initializers stored into them"); STATISTIC(NumSubstitute,"Number of globals with initializers stored into them");
STATISTIC(NumDeleted , "Number of globals deleted"); STATISTIC(NumDeleted , "Number of globals deleted");
STATISTIC(NumFnDeleted , "Number of functions deleted");
STATISTIC(NumGlobUses , "Number of global uses devirtualized"); STATISTIC(NumGlobUses , "Number of global uses devirtualized");
STATISTIC(NumLocalized , "Number of globals localized"); STATISTIC(NumLocalized , "Number of globals localized");
STATISTIC(NumShrunkToBool , "Number of global vars shrunk to booleans"); STATISTIC(NumShrunkToBool , "Number of global vars shrunk to booleans");
@ -83,6 +82,7 @@ namespace {
bool OptimizeFunctions(Module &M); bool OptimizeFunctions(Module &M);
bool OptimizeGlobalVars(Module &M); bool OptimizeGlobalVars(Module &M);
bool OptimizeGlobalAliases(Module &M); bool OptimizeGlobalAliases(Module &M);
bool deleteIfDead(GlobalValue &GV);
bool processGlobal(GlobalVariable *GV); bool processGlobal(GlobalVariable *GV);
bool processInternalGlobal(GlobalVariable *GV, const GlobalStatus &GS); bool processInternalGlobal(GlobalVariable *GV, const GlobalStatus &GS);
bool OptimizeEmptyGlobalCXXDtors(Function *CXAAtExitFn); bool OptimizeEmptyGlobalCXXDtors(Function *CXAAtExitFn);
@ -1679,20 +1679,37 @@ static bool TryToShrinkGlobalToBoolean(GlobalVariable *GV, Constant *OtherVal) {
return true; return true;
} }
bool GlobalOpt::deleteIfDead(GlobalValue &GV) {
GV.removeDeadConstantUsers();
if (!GV.isDiscardableIfUnused())
return false;
if (const Comdat *C = GV.getComdat())
if (!GV.hasLocalLinkage() && NotDiscardableComdats.count(C))
return false;
bool Dead;
if (auto *F = dyn_cast<Function>(&GV))
Dead = F->isDefTriviallyDead();
else
Dead = GV.use_empty();
if (!Dead)
return false;
DEBUG(dbgs() << "GLOBAL DEAD: " << GV << "\n");
GV.eraseFromParent();
++NumDeleted;
return true;
}
/// Analyze the specified global variable and optimize it if possible. If we /// Analyze the specified global variable and optimize it if possible. If we
/// make a change, return true. /// make a change, return true.
bool GlobalOpt::processGlobal(GlobalVariable *GV) { bool GlobalOpt::processGlobal(GlobalVariable *GV) {
// Do more involved optimizations if the global is internal. if (deleteIfDead(*GV))
GV->removeDeadConstantUsers();
if (GV->use_empty()) {
DEBUG(dbgs() << "GLOBAL DEAD: " << *GV << "\n");
GV->eraseFromParent();
++NumDeleted;
return true; return true;
}
// Do more involved optimizations if the global is internal.
if (!GV->hasLocalLinkage()) if (!GV->hasLocalLinkage())
return false; return false;
@ -2023,13 +2040,8 @@ bool GlobalOpt::OptimizeFunctions(Module &M) {
if (!F->hasName() && !F->isDeclaration() && !F->hasLocalLinkage()) if (!F->hasName() && !F->isDeclaration() && !F->hasLocalLinkage())
F->setLinkage(GlobalValue::InternalLinkage); F->setLinkage(GlobalValue::InternalLinkage);
const Comdat *C = F->getComdat(); if (deleteIfDead(*F)) {
bool inComdat = C && NotDiscardableComdats.count(C);
F->removeDeadConstantUsers();
if ((!inComdat || F->hasLocalLinkage()) && F->isDefTriviallyDead()) {
F->eraseFromParent();
Changed = true; Changed = true;
++NumFnDeleted;
continue; continue;
} }
if (!F->hasLocalLinkage()) if (!F->hasLocalLinkage())
@ -2075,12 +2087,7 @@ bool GlobalOpt::OptimizeGlobalVars(Module &M) {
GV->setInitializer(New); GV->setInitializer(New);
} }
if (GV->isDiscardableIfUnused()) { Changed |= processGlobal(GV);
if (const Comdat *C = GV->getComdat())
if (NotDiscardableComdats.count(C) && !GV->hasLocalLinkage())
continue;
Changed |= processGlobal(GV);
}
} }
return Changed; return Changed;
} }