replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make safer variant of alias resolution routine to be default 

llvm-svn: 56005
This commit is contained in:
Anton Korobeynikov 2008-09-09 20:05:04 +00:00
parent fac18fe2ee
commit 1a1140429e
8 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/GlobalAlias.h
View File

@ -76,10 +76,10 @@ public:
/// resolveAliasedGlobal() - This method tries to ultimately resolve the alias
/// by going through the aliasing chain and trying to find the very last
/// global. Returns NULL if a cycle was found. If traverseWeak is true, then
/// global. Returns NULL if a cycle was found. If stopOnWeak is false, then
/// the whole chain aliasing chain is traversed, otherwise - only strong
/// aliases.
const GlobalValue* resolveAliasedGlobal(bool traverseWeak = true) const;
const GlobalValue* resolveAliasedGlobal(bool stopOnWeak = true) const;
// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const GlobalAlias *) { return true; }

2
llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
View File

@ -949,7 +949,7 @@ SDValue SelectionDAG::getGlobalAddress(const GlobalValue *GV,
if (!GVar) {
// If GV is an alias then use the aliasee for determining thread-localness.
if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(GV))
GVar = dyn_cast_or_null<GlobalVariable>(GA->resolveAliasedGlobal());
GVar = dyn_cast_or_null<GlobalVariable>(GA->resolveAliasedGlobal(false));
}
if (GVar && GVar->isThreadLocal())

2
llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
View File

@ -567,7 +567,7 @@ void *JITEmitter::getPointerToGlobal(GlobalValue *V, void *Reference,
return TheJIT->getOrEmitGlobalVariable(GV);
}
if (GlobalAlias *GA = dyn_cast<GlobalAlias>(V))
return TheJIT->getPointerToGlobal(GA->resolveAliasedGlobal());
return TheJIT->getPointerToGlobal(GA->resolveAliasedGlobal(false));
// If we have already compiled the function, return a pointer to its body.
Function *F = cast<Function>(V);

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

@ -1169,7 +1169,7 @@ static bool LinkAppendingVars(Module *M,
static bool ResolveAliases(Module *Dest) {
for (Module::alias_iterator I = Dest->alias_begin(), E = Dest->alias_end();
I != E; ++I)
if (const GlobalValue *GV = I->resolveAliasedGlobal(/*traverseWeak*/ false))
if (const GlobalValue *GV = I->resolveAliasedGlobal())
if (GV != I && !GV->isDeclaration())
I->replaceAllUsesWith(const_cast<GlobalValue*>(GV));

2
llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
View File

@ -369,7 +369,7 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
// If GV is an alias then use the aliasee for determining
// thread-localness.
if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(GV))
GVar = dyn_cast_or_null<GlobalVariable>(GA->resolveAliasedGlobal());
GVar = dyn_cast_or_null<GlobalVariable>(GA->resolveAliasedGlobal(false));
}
bool isThreadLocal = GVar && GVar->isThreadLocal();

3
llvm/lib/Transforms/IPO/GlobalOpt.cpp
View File

@ -2223,7 +2223,7 @@ bool GlobalOpt::ResolveAliases(Module &M) {
if (I->use_empty())
continue;
if (const GlobalValue *GV = I->resolveAliasedGlobal(/*traverseWeak*/ false))
if (const GlobalValue *GV = I->resolveAliasedGlobal())
if (GV != I) {
I->replaceAllUsesWith(const_cast<GlobalValue*>(GV));
Changed = true;
@ -2252,7 +2252,6 @@ bool GlobalOpt::runOnModule(Module &M) {
// Optimize non-address-taken globals.
LocalChange |= OptimizeGlobalVars(M);
Changed |= LocalChange;
// Resolve aliases, when possible.
LocalChange |= ResolveAliases(M);

6
llvm/lib/VMCore/Globals.cpp
View File

@ -248,11 +248,11 @@ const GlobalValue *GlobalAlias::getAliasedGlobal() const {
return 0;
}
const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool traverseWeak) const {
const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool stopOnWeak) const {
SmallPtrSet<const GlobalValue*, 3> Visited;
// Check if we need to stop early.
if (!traverseWeak && hasWeakLinkage())
if (stopOnWeak && hasWeakLinkage())
return this;
const GlobalValue *GV = getAliasedGlobal();
@ -260,7 +260,7 @@ const GlobalValue *GlobalAlias::resolveAliasedGlobal(bool traverseWeak) const {
// Iterate over aliasing chain, stopping on weak alias if necessary.
while (const GlobalAlias *GA = dyn_cast<GlobalAlias>(GV)) {
if (!traverseWeak && GA->hasWeakLinkage())
if (stopOnWeak && GA->hasWeakLinkage())
break;
GV = GA->getAliasedGlobal();

2
llvm/lib/VMCore/Verifier.cpp
View File

@ -394,7 +394,7 @@ void Verifier::visitGlobalAlias(GlobalAlias &GA) {
&GA);
}
const GlobalValue* Aliasee = GA.resolveAliasedGlobal();
const GlobalValue* Aliasee = GA.resolveAliasedGlobal(/*stopOnWeak*/ false);
Assert1(Aliasee,
"Aliasing chain should end with function or global variable", &GA);