diff options
| author | Reid Kleckner <rnk@google.com> | 2016-08-11 16:00:43 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-08-11 16:00:43 +0000 |
| commit | 26f9e9ebc3224a82287e9eeed9262fbc31784e28 (patch) | |
| tree | 75cc2c5df1f5e4f7bdf14094cad5bdb28f069cf8 /llvm/lib/CodeGen/Analysis.cpp | |
| parent | fdfde19985911ed9fd1fc02bd7683b95ba204d91 (diff) | |
| download | bcm5719-llvm-26f9e9ebc3224a82287e9eeed9262fbc31784e28.tar.gz bcm5719-llvm-26f9e9ebc3224a82287e9eeed9262fbc31784e28.zip | |
Remove FIXME about asserting on the end iterator
After machine block placement, MBBs may not have terminators, and it is
appropriate to check for the end iterator here. We can fold the check
into the next if, as well. This look is really just looking for BBs that
end in CATCHRET.
llvm-svn: 278350
Diffstat (limited to 'llvm/lib/CodeGen/Analysis.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/Analysis.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/Analysis.cpp b/llvm/lib/CodeGen/Analysis.cpp index 9fb29b84830..ebbcaeb3057 100644 --- a/llvm/lib/CodeGen/Analysis.cpp +++ b/llvm/lib/CodeGen/Analysis.cpp @@ -695,13 +695,9 @@ llvm::getFuncletMembership(const MachineFunction &MF) { MachineBasicBlock::const_iterator MBBI = MBB.getFirstTerminator(); - // FIXME: Should this be an assertion? It fires all over in X86. - if (MBBI == MBB.end()) - continue; - // CatchPads are not funclets for SEH so do not consider CatchRet to // transfer control to another funclet. - if (MBBI->getOpcode() != TII->getCatchReturnOpcode()) + if (MBBI == MBB.end() || MBBI->getOpcode() != TII->getCatchReturnOpcode()) continue; // FIXME: SEH CatchPads are not necessarily in the parent function: |
