mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 20:51:52 +01:00
[SimplifyCFG] Don't kill empty cleanuppads with multiple uses
A basic block could contain: %cp = cleanuppad [] cleanupret from %cp unwind to caller This basic block is empty and is thus a candidate for removal. However, there can be other uses of %cp outside of this basic block. This is only possible in unreachable blocks. Make our transform more correct by checking that the pad has a single user before removing the BB. This fixes PR28005. llvm-svn: 271816
This commit is contained in:
parent
6972cf3620
commit
3c5fa38a11
@ -3424,6 +3424,11 @@ static bool removeEmptyCleanup(CleanupReturnInst *RI) {
|
|||||||
// This isn't an empty cleanup.
|
// This isn't an empty cleanup.
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
// We cannot kill the pad if it has multiple uses. This typically arises
|
||||||
|
// from unreachable basic blocks.
|
||||||
|
if (!CPInst->hasOneUse())
|
||||||
|
return false;
|
||||||
|
|
||||||
// Check that there are no other instructions except for benign intrinsics.
|
// Check that there are no other instructions except for benign intrinsics.
|
||||||
BasicBlock::iterator I = CPInst->getIterator(), E = RI->getIterator();
|
BasicBlock::iterator I = CPInst->getIterator(), E = RI->getIterator();
|
||||||
while (++I != E) {
|
while (++I != E) {
|
||||||
|
@ -434,6 +434,30 @@ try.cont:
|
|||||||
ret i32 0
|
ret i32 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
; CHECK-LABEL: define void @f10(
|
||||||
|
define void @f10(i32 %V) personality i32 (...)* @__CxxFrameHandler3 {
|
||||||
|
entry:
|
||||||
|
invoke void @g()
|
||||||
|
to label %unreachable unwind label %cleanup
|
||||||
|
; CHECK: call void @g()
|
||||||
|
; CHECK-NEXT: unreachable
|
||||||
|
|
||||||
|
unreachable:
|
||||||
|
unreachable
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
%cp = cleanuppad within none []
|
||||||
|
switch i32 %V, label %cleanupret1 [
|
||||||
|
i32 0, label %cleanupret2
|
||||||
|
]
|
||||||
|
|
||||||
|
cleanupret1:
|
||||||
|
cleanupret from %cp unwind to caller
|
||||||
|
|
||||||
|
cleanupret2:
|
||||||
|
cleanupret from %cp unwind to caller
|
||||||
|
}
|
||||||
|
|
||||||
%struct.S = type { i8 }
|
%struct.S = type { i8 }
|
||||||
%struct.S2 = type { i8 }
|
%struct.S2 = type { i8 }
|
||||||
declare void @"\01??1S2@@QEAA@XZ"(%struct.S2*)
|
declare void @"\01??1S2@@QEAA@XZ"(%struct.S2*)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user