diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-07-27 20:18:04 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-07-27 20:18:04 +0000 |
| commit | 6c923bb8d9bb0cb7067cb8c7b001ccd19bcfd8ac (patch) | |
| tree | b8b9205a5878072365529a009c886d6333783455 /llvm/lib/CodeGen/ShadowStackGC.cpp | |
| parent | 833b9d335380864b62820bcc8c260ba278225dcd (diff) | |
| download | bcm5719-llvm-6c923bb8d9bb0cb7067cb8c7b001ccd19bcfd8ac.tar.gz bcm5719-llvm-6c923bb8d9bb0cb7067cb8c7b001ccd19bcfd8ac.zip | |
Merge the contents from exception-handling-rewrite to the mainline.
This adds the new instructions 'landingpad' and 'resume'.
llvm-svn: 136253
Diffstat (limited to 'llvm/lib/CodeGen/ShadowStackGC.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/ShadowStackGC.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/ShadowStackGC.cpp b/llvm/lib/CodeGen/ShadowStackGC.cpp index 9807c8cb27e..daab89b8f2d 100644 --- a/llvm/lib/CodeGen/ShadowStackGC.cpp +++ b/llvm/lib/CodeGen/ShadowStackGC.cpp @@ -113,9 +113,11 @@ namespace { while (StateBB != StateE) { BasicBlock *CurBB = StateBB++; - // Branches and invokes do not escape, only unwind and return do. + // Branches and invokes do not escape, only unwind, resume, and return + // do. TerminatorInst *TI = CurBB->getTerminator(); - if (!isa<UnwindInst>(TI) && !isa<ReturnInst>(TI)) + if (!isa<UnwindInst>(TI) && !isa<ReturnInst>(TI) && + !isa<ResumeInst>(TI)) continue; Builder.SetInsertPoint(TI->getParent(), TI); |
