RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-12 19:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix inlining to not lose the "cleanup" clause from landingpads

Browse Source 
This fixes PR17872.  This bug can lead to C++ destructors not being
called when they should be, when an exception is thrown.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196711 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Mark Seaborn 2013-12-08 00:51:21 +00:00
parent 615f9b7162
commit 34005c92bb
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Transforms/Utils/InlineFunction.cpp
View File

@ -238,6 +238,8 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock,
InlinedLPad->reserveClauses(OuterNum); InlinedLPad->reserveClauses(OuterNum);
for (unsigned OuterIdx = 0; OuterIdx != OuterNum; ++OuterIdx) for (unsigned OuterIdx = 0; OuterIdx != OuterNum; ++OuterIdx)
InlinedLPad->addClause(OuterLPad->getClause(OuterIdx)); InlinedLPad->addClause(OuterLPad->getClause(OuterIdx));
if (OuterLPad->isCleanup())
InlinedLPad->setCleanup(true);
} }
for (Function::iterator BB = FirstNewBlock, E = Caller->end(); BB != E; ++BB){ for (Function::iterator BB = FirstNewBlock, E = Caller->end(); BB != E; ++BB){

39
test/Transforms/Inline/invoke-cleanup.ll Normal file
View File

@ -0,0 +1,39 @@
; RUN: opt %s -inline -S | FileCheck %s
declare void @external_func()
@exception_type1 = external global i8
@exception_type2 = external global i8
define internal void @inner() {
invoke void @external_func()
to label %cont unwind label %lpad
cont:
ret void
lpad:
%lp = landingpad i32 personality i8* null
catch i8* @exception_type1
resume i32 %lp
}
; Test that the "cleanup" clause is kept when inlining @inner() into
; this call site (PR17872), otherwise C++ destructors will not be
; called when they should be.
define void @outer() {
invoke void @inner()
to label %cont unwind label %lpad
cont:
ret void
lpad:
%lp = landingpad i32 personality i8* null
cleanup
catch i8* @exception_type2
resume i32 %lp
}
; CHECK: define void @outer
; CHECK: landingpad
; CHECK-NEXT: cleanup
; CHECK-NEXT: catch i8* @exception_type1
; CHECK-NEXT: catch i8* @exception_type2