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

Use the catch-all selectors we already found when converting them to use the

Browse Source 
correct catch-all value. This saves having to iterate through all of the
selectors in the program again.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107345 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2010-06-30 22:49:53 +00:00
parent 7fa1bbad29
commit d9e3b2b547
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/CodeGen/DwarfEHPrepare.cpp
View File

@ -88,12 +88,13 @@ namespace {
/// CleanupSelectors - Any remaining eh.selector intrinsic calls which still /// CleanupSelectors - Any remaining eh.selector intrinsic calls which still
/// use the ".llvm.eh.catch.all.value" call need to convert to using its /// use the ".llvm.eh.catch.all.value" call need to convert to using its
/// initializer instead. /// initializer instead.
bool CleanupSelectors(); bool CleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels);
bool HasCatchAllInSelector(IntrinsicInst *); bool HasCatchAllInSelector(IntrinsicInst *);
/// FindAllCleanupSelectors - Find all eh.selector calls that are clean-ups. /// FindAllCleanupSelectors - Find all eh.selector calls that are clean-ups.
void FindAllCleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels); void FindAllCleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels,
SmallPtrSet<IntrinsicInst*, 32> &CatchAllSels);
/// FindAllURoRInvokes - Find all URoR invokes in the function. /// FindAllURoRInvokes - Find all URoR invokes in the function.
void FindAllURoRInvokes(SmallPtrSet<InvokeInst*, 32> &URoRInvokes); void FindAllURoRInvokes(SmallPtrSet<InvokeInst*, 32> &URoRInvokes);
@ -201,7 +202,8 @@ bool DwarfEHPrepare::HasCatchAllInSelector(IntrinsicInst *II) {
/// FindAllCleanupSelectors - Find all eh.selector calls that are clean-ups. /// FindAllCleanupSelectors - Find all eh.selector calls that are clean-ups.
void DwarfEHPrepare:: void DwarfEHPrepare::
FindAllCleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels) { FindAllCleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels,
SmallPtrSet<IntrinsicInst*, 32> &CatchAllSels) {
for (Value::use_iterator for (Value::use_iterator
I = SelectorIntrinsic->use_begin(), I = SelectorIntrinsic->use_begin(),
E = SelectorIntrinsic->use_end(); I != E; ++I) { E = SelectorIntrinsic->use_end(); I != E; ++I) {
@ -212,6 +214,8 @@ FindAllCleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels) {
if (!HasCatchAllInSelector(II)) if (!HasCatchAllInSelector(II))
Sels.insert(II); Sels.insert(II);
else
CatchAllSels.insert(II);
} }
} }
@ -229,7 +233,7 @@ FindAllURoRInvokes(SmallPtrSet<InvokeInst*, 32> &URoRInvokes) {
/// CleanupSelectors - Any remaining eh.selector intrinsic calls which still use /// CleanupSelectors - Any remaining eh.selector intrinsic calls which still use
/// the ".llvm.eh.catch.all.value" call need to convert to using its /// the ".llvm.eh.catch.all.value" call need to convert to using its
/// initializer instead. /// initializer instead.
bool DwarfEHPrepare::CleanupSelectors() { bool DwarfEHPrepare::CleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels) {
if (!EHCatchAllValue) return false; if (!EHCatchAllValue) return false;
if (!SelectorIntrinsic) { if (!SelectorIntrinsic) {
@ -239,11 +243,9 @@ bool DwarfEHPrepare::CleanupSelectors() {
} }
bool Changed = false; bool Changed = false;
for (Value::use_iterator for (SmallPtrSet<IntrinsicInst*, 32>::iterator
I = SelectorIntrinsic->use_begin(), I = Sels.begin(), E = Sels.end(); I != E; ++I) {
E = SelectorIntrinsic->use_end(); I != E; ++I) { IntrinsicInst *Sel = *I;
IntrinsicInst *Sel = dyn_cast<IntrinsicInst>(I);
if (!Sel || Sel->getParent()->getParent() != F) continue;
// Index of the ".llvm.eh.catch.all.value" variable. // Index of the ".llvm.eh.catch.all.value" variable.
unsigned OpIdx = Sel->getNumArgOperands() - 1; unsigned OpIdx = Sel->getNumArgOperands() - 1;
@ -300,8 +302,6 @@ DwarfEHPrepare::FindSelectorAndURoR(Instruction *Inst, bool &URoRInvoke,
/// function. This is a candidate to merge the selector associated with the URoR /// function. This is a candidate to merge the selector associated with the URoR
/// invoke with the one from the URoR's landing pad. /// invoke with the one from the URoR's landing pad.
bool DwarfEHPrepare::HandleURoRInvokes() { bool DwarfEHPrepare::HandleURoRInvokes() {
if (!DT) return CleanupSelectors(); // We require DominatorTree information.
if (!EHCatchAllValue) { if (!EHCatchAllValue) {
EHCatchAllValue = EHCatchAllValue =
F->getParent()->getNamedGlobal(".llvm.eh.catch.all.value"); F->getParent()->getNamedGlobal(".llvm.eh.catch.all.value");
@ -314,14 +314,20 @@ bool DwarfEHPrepare::HandleURoRInvokes() {
if (!SelectorIntrinsic) return false; if (!SelectorIntrinsic) return false;
} }
SmallPtrSet<IntrinsicInst*, 32> Sels;
SmallPtrSet<IntrinsicInst*, 32> CatchAllSels;
FindAllCleanupSelectors(Sels, CatchAllSels);
if (!DT)
// We require DominatorTree information.
return CleanupSelectors(CatchAllSels);
if (!URoR) { if (!URoR) {
URoR = F->getParent()->getFunction("_Unwind_Resume_or_Rethrow"); URoR = F->getParent()->getFunction("_Unwind_Resume_or_Rethrow");
if (!URoR) return CleanupSelectors(); if (!URoR) return CleanupSelectors(CatchAllSels);
} }
SmallPtrSet<IntrinsicInst*, 32> Sels;
SmallPtrSet<InvokeInst*, 32> URoRInvokes; SmallPtrSet<InvokeInst*, 32> URoRInvokes;
FindAllCleanupSelectors(Sels);
FindAllURoRInvokes(URoRInvokes); FindAllURoRInvokes(URoRInvokes);
SmallPtrSet<IntrinsicInst*, 32> SelsToConvert; SmallPtrSet<IntrinsicInst*, 32> SelsToConvert;
@ -347,7 +353,8 @@ bool DwarfEHPrepare::HandleURoRInvokes() {
if (!ExceptionValueIntrinsic) { if (!ExceptionValueIntrinsic) {
ExceptionValueIntrinsic = ExceptionValueIntrinsic =
Intrinsic::getDeclaration(F->getParent(), Intrinsic::eh_exception); Intrinsic::getDeclaration(F->getParent(), Intrinsic::eh_exception);
if (!ExceptionValueIntrinsic) return CleanupSelectors(); if (!ExceptionValueIntrinsic)
return CleanupSelectors(CatchAllSels);
} }
for (Value::use_iterator for (Value::use_iterator
@ -414,7 +421,7 @@ bool DwarfEHPrepare::HandleURoRInvokes() {
} }
} }
Changed |= CleanupSelectors(); Changed |= CleanupSelectors(CatchAllSels);
return Changed; return Changed;
} }