RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-03 13:51:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Loosen up the requirements in the Horrible Hack(tm) to include all selectors

Browse Source 
which don't have a catch-all associated with them not just clean-ups. This fixes
the SingleSource/Benchmarks/Shootout-C++/except.cpp testcase that broke because
of my change r105902.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@106772 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2010-06-24 18:49:10 +00:00
parent 761fa7af9e
commit efbf306107
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/CodeGen/DwarfEHPrepare.cpp
View File

@ -89,7 +89,7 @@ namespace {
/// initializer instead. /// initializer instead.
bool CleanupSelectors(); bool CleanupSelectors();
bool IsACleanupSelector(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);
@ -188,34 +188,14 @@ FunctionPass *llvm::createDwarfEHPass(const TargetMachine *tm, bool fast) {
return new DwarfEHPrepare(tm, fast); return new DwarfEHPrepare(tm, fast);
} }
/// IsACleanupSelector - Return true if the intrinsic instruction is a clean-up /// HasCatchAllInSelector - Return true if the intrinsic instruction has a
/// selector instruction. /// catch-all.
bool DwarfEHPrepare::IsACleanupSelector(IntrinsicInst *II) { bool DwarfEHPrepare::HasCatchAllInSelector(IntrinsicInst *II) {
unsigned NumOps = II->getNumOperands(); if (!EHCatchAllValue) return false;
bool IsCleanUp = (NumOps == 3);
if (IsCleanUp) unsigned OpIdx = II->getNumOperands() - 1;
return true; GlobalVariable *GV = dyn_cast<GlobalVariable>(II->getOperand(OpIdx));
return GV == EHCatchAllValue;
if (ConstantInt *CI = dyn_cast<ConstantInt>(II->getOperand(3))) {
unsigned Val = CI->getZExtValue();
if (Val == 0 || Val + 3 == NumOps) {
// If the value is 0 or the selector has only filters in it, then it's
// a cleanup.
return true;
} else {
assert(Val + 3 < NumOps && "Ill-formed eh.selector!");
if (Val + 4 == NumOps) {
if (ConstantInt *FinalVal =
dyn_cast<ConstantInt>(II->getOperand(NumOps - 1)))
return FinalVal->isZero();
}
}
}
return false;
} }
/// FindAllCleanupSelectors - Find all eh.selector calls that are clean-ups. /// FindAllCleanupSelectors - Find all eh.selector calls that are clean-ups.
@ -229,7 +209,7 @@ FindAllCleanupSelectors(SmallPtrSet<IntrinsicInst*, 32> &Sels) {
if (II->getParent()->getParent() != F) if (II->getParent()->getParent() != F)
continue; continue;
if (IsACleanupSelector(II)) if (!HasCatchAllInSelector(II))
Sels.insert(II); Sels.insert(II);
} }
} }
@ -387,7 +367,7 @@ bool DwarfEHPrepare::HandleURoRInvokes() {
// need to convert it to a 'catch-all'. // need to convert it to a 'catch-all'.
for (SmallPtrSet<IntrinsicInst*, 8>::iterator for (SmallPtrSet<IntrinsicInst*, 8>::iterator
SI = SelCalls.begin(), SE = SelCalls.end(); SI != SE; ++SI) SI = SelCalls.begin(), SE = SelCalls.end(); SI != SE; ++SI)
if (IsACleanupSelector(*SI)) if (!HasCatchAllInSelector(*SI))
SelsToConvert.insert(*SI); SelsToConvert.insert(*SI);
} }
} }