diff options
Diffstat (limited to 'llvm/lib/CodeGen/WinEHPrepare.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/WinEHPrepare.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp index 3e16a25f79e..8157857bc25 100644 --- a/llvm/lib/CodeGen/WinEHPrepare.cpp +++ b/llvm/lib/CodeGen/WinEHPrepare.cpp @@ -254,9 +254,11 @@ static void calculateCXXStateNumbers(WinEHFuncInfo &FuncInfo, FuncInfo.FuncletBaseStateMap[CatchPad] = CatchLow; for (const User *U : CatchPad->users()) { const auto *UserI = cast<Instruction>(U); - if (auto *InnerCatchSwitch = dyn_cast<CatchSwitchInst>(UserI)) - if (InnerCatchSwitch->getUnwindDest() == CatchSwitch->getUnwindDest()) + if (auto *InnerCatchSwitch = dyn_cast<CatchSwitchInst>(UserI)) { + BasicBlock *UnwindDest = InnerCatchSwitch->getUnwindDest(); + if (!UnwindDest || UnwindDest == CatchSwitch->getUnwindDest()) calculateCXXStateNumbers(FuncInfo, UserI, CatchLow); + } if (auto *InnerCleanupPad = dyn_cast<CleanupPadInst>(UserI)) { BasicBlock *UnwindDest = getCleanupRetUnwindDest(InnerCleanupPad); // If a nested cleanup pad reports a null unwind destination and the @@ -361,9 +363,11 @@ static void calculateSEHStateNumbers(WinEHFuncInfo &FuncInfo, // outside the __try. for (const User *U : CatchPad->users()) { const auto *UserI = cast<Instruction>(U); - if (auto *InnerCatchSwitch = dyn_cast<CatchSwitchInst>(UserI)) - if (InnerCatchSwitch->getUnwindDest() == CatchSwitch->getUnwindDest()) + if (auto *InnerCatchSwitch = dyn_cast<CatchSwitchInst>(UserI)) { + BasicBlock *UnwindDest = InnerCatchSwitch->getUnwindDest(); + if (!UnwindDest || UnwindDest == CatchSwitch->getUnwindDest()) calculateSEHStateNumbers(FuncInfo, UserI, ParentState); + } if (auto *InnerCleanupPad = dyn_cast<CleanupPadInst>(UserI)) { BasicBlock *UnwindDest = getCleanupRetUnwindDest(InnerCleanupPad); // If a nested cleanup pad reports a null unwind destination and the |
