diff options
| author | Mark Seaborn <mseaborn@chromium.org> | 2013-12-08 00:51:21 +0000 |
|---|---|---|
| committer | Mark Seaborn <mseaborn@chromium.org> | 2013-12-08 00:51:21 +0000 |
| commit | 1b3dd3527ee717a55641a5fd1a85f7ac6aa1c857 (patch) | |
| tree | 4df41fbbaf149593f8680e6cf26f916ba2c71dc5 /llvm/lib/Transforms/Utils/InlineFunction.cpp | |
| parent | ef3dbb93ecd7bf51d39f5d06fcdf137e8c1b5b76 (diff) | |
| download | bcm5719-llvm-1b3dd3527ee717a55641a5fd1a85f7ac6aa1c857.tar.gz bcm5719-llvm-1b3dd3527ee717a55641a5fd1a85f7ac6aa1c857.zip | |
Fix inlining to not lose the "cleanup" clause from landingpads
This fixes PR17872. This bug can lead to C++ destructors not being
called when they should be, when an exception is thrown.
llvm-svn: 196711
Diffstat (limited to 'llvm/lib/Transforms/Utils/InlineFunction.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/InlineFunction.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp index 405f77e793f..e35a1d0b006 100644 --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp +++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp @@ -238,6 +238,8 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock, InlinedLPad->reserveClauses(OuterNum); for (unsigned OuterIdx = 0; OuterIdx != OuterNum; ++OuterIdx) InlinedLPad->addClause(OuterLPad->getClause(OuterIdx)); + if (OuterLPad->isCleanup()) + InlinedLPad->setCleanup(true); } for (Function::iterator BB = FirstNewBlock, E = Caller->end(); BB != E; ++BB){ |
