mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-18 10:31:57 +00:00
GlobalOpt only process non constant local GVs while optimizing global vars.
If non constant local GV named A is used by a constant local GV named B (e.g. llvm.dbg.variable) and B is not used by anyone else then eliminate A as well as B. In other words, debug info should not interfere in removal of unused GV. --This life, and those below, will be ignored-- M test/Transforms/GlobalOpt/2009-03-03-dbg.ll M lib/Transforms/IPO/GlobalOpt.cpp git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66167 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
30a31ebf7f
commit
5049600672
@ -137,17 +137,28 @@ struct VISIBILITY_HIDDEN GlobalStatus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// ConstantIsDead - Return true if the specified constant is (transitively)
|
/// ConstantIsDead - Return true if the specified constant is (transitively)
|
||||||
/// dead. The constant may be used by other constants (e.g. constant arrays and
|
/// dead. The constant may be used by other constants (e.g. constant arrays,
|
||||||
/// constant exprs) as long as they are dead, but it cannot be used by anything
|
/// constant exprs, constant global variables) as long as they are dead,
|
||||||
/// else.
|
/// but it cannot be used by anything else. If DeadGVs is not null then
|
||||||
static bool ConstantIsDead(Constant *C) {
|
/// record dead constant GV users.
|
||||||
|
static bool ConstantIsDead(Constant *C,
|
||||||
|
SmallPtrSet<GlobalVariable *, 4> *DeadGVs = false) {
|
||||||
if (isa<GlobalValue>(C)) return false;
|
if (isa<GlobalValue>(C)) return false;
|
||||||
|
|
||||||
for (Value::use_iterator UI = C->use_begin(), E = C->use_end(); UI != E; ++UI)
|
for (Value::use_iterator UI = C->use_begin(), E = C->use_end(); UI != E; ++UI) {
|
||||||
if (Constant *CU = dyn_cast<Constant>(*UI)) {
|
if (GlobalVariable *GV = dyn_cast<GlobalVariable>(*UI)) {
|
||||||
if (!ConstantIsDead(CU)) return false;
|
if (!GV->isConstant() || !GV->hasLocalLinkage() || !GV->use_empty())
|
||||||
|
return false;
|
||||||
|
else {
|
||||||
|
if (DeadGVs)
|
||||||
|
DeadGVs->insert(GV);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (Constant *CU = dyn_cast<Constant>(*UI)) {
|
||||||
|
if (!ConstantIsDead(CU, DeadGVs)) return false;
|
||||||
} else
|
} else
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -338,7 +349,18 @@ static bool CleanupConstantGlobalUsers(Value *V, Constant *Init) {
|
|||||||
} else if (Constant *C = dyn_cast<Constant>(U)) {
|
} else if (Constant *C = dyn_cast<Constant>(U)) {
|
||||||
// If we have a chain of dead constantexprs or other things dangling from
|
// If we have a chain of dead constantexprs or other things dangling from
|
||||||
// us, and if they are all dead, nuke them without remorse.
|
// us, and if they are all dead, nuke them without remorse.
|
||||||
if (ConstantIsDead(C)) {
|
SmallPtrSet<GlobalVariable *, 4> DeadGVs;
|
||||||
|
if (ConstantIsDead(C, &DeadGVs)) {
|
||||||
|
for (SmallPtrSet<GlobalVariable *, 4>::iterator TI = DeadGVs.begin(),
|
||||||
|
TE = DeadGVs.end(); TI != TE; ) {
|
||||||
|
GlobalVariable *TGV = *TI; ++TI;
|
||||||
|
if (TGV == C)
|
||||||
|
C = NULL;
|
||||||
|
TGV->eraseFromParent();
|
||||||
|
}
|
||||||
|
if (GlobalVariable *GV = dyn_cast<GlobalVariable>(C))
|
||||||
|
GV->eraseFromParent();
|
||||||
|
else if (C)
|
||||||
C->destroyConstant();
|
C->destroyConstant();
|
||||||
// This could have invalidated UI, start over from scratch.
|
// This could have invalidated UI, start over from scratch.
|
||||||
CleanupConstantGlobalUsers(V, Init);
|
CleanupConstantGlobalUsers(V, Init);
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global_variable42
|
; RUN: llvm-as < %s | opt -globalopt | llvm-dis | not grep global_variable42
|
||||||
; XFAIL: *
|
|
||||||
|
|
||||||
%llvm.dbg.anchor.type = type { i32, i32 }
|
%llvm.dbg.anchor.type = type { i32, i32 }
|
||||||
%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
|
%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
|
||||||
|
Loading…
Reference in New Issue
Block a user