6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-01 00:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Fixing a bug with optimized catch-all handlers in WinEHPrepare

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233439 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Kaylor 2015-03-27 22:31:12 +00:00
parent de89228dfb
commit 292142ec8d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/CodeGen/WinEHPrepare.cpp
View File

@ -126,6 +126,7 @@ public:
return mapIfEHLoad(Load, SelectorStores, SelectorStoreAddrs);
}
bool isOriginLandingPadBlock(const BasicBlock *BB) const;
bool isLandingPadSpecificInst(const Instruction *Inst) const;
void remapSelector(ValueToValueMapTy &VMap, Value *MappedValue) const;
@ -840,6 +841,10 @@ void LandingPadMap::mapLandingPad(const LandingPadInst *LPad) {
}
}
bool LandingPadMap::isOriginLandingPadBlock(const BasicBlock *BB) const {
return BB->getLandingPadInst() == OriginLPad;
}
bool LandingPadMap::isLandingPadSpecificInst(const Instruction *Inst) const {
if (Inst == OriginLPad)
return true;
@ -981,11 +986,12 @@ WinEHCatchDirector::handleEndCatch(ValueToValueMapTy &VMap,
// The end catch call can occur in one of two places: either in a
// landingpad block that is part of the catch handlers exception mechanism,
// or at the end of the catch block. If it occurs in a landing pad, we must
// skip it and continue so that the landing pad gets cloned.
// FIXME: This case isn't fully supported yet and shouldn't turn up in any
// of the test cases until it is.
if (IntrinCall->getParent()->isLandingPad())
// or at the end of the catch block. However, a catch-all handler may call
// end catch from the original landing pad. If the call occurs in a nested
// landing pad block, we must skip it and continue so that the landing pad
// gets cloned.
auto *ParentBB = IntrinCall->getParent();
if (ParentBB->isLandingPad() && !LPadMap.isOriginLandingPadBlock(ParentBB))
return CloningDirector::SkipInstruction;
// If an end catch occurs anywhere else the next instruction should be an
@ -1475,6 +1481,9 @@ CleanupHandler *WinEHPrepare::findCleanupHandler(BasicBlock *StartBB,
continue;
if (Inst == Branch)
continue;
// This can happen with a catch-all handler.
if (match(Inst, m_Intrinsic<Intrinsic::eh_begincatch>()))
return nullptr;
if (match(Inst, m_Intrinsic<Intrinsic::eh_endcatch>()))
continue;
// Anything else makes this interesting cleanup code.