RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

[Reduce] Basic block reduction: do properly handle invoke insts (PR46818)

Browse Source 
Terminator may have returned value, so we need to replace uses,
and in general handle invoke as a branch inst.

I'm not sure this is the best handling, but IMO poorly reduced
input is much better than crashing reduction tool.
A (previously-crashing!) test added.

Fixes https://bugs.llvm.org/show_bug.cgi?id=46818
This commit is contained in:
Roman Lebedev 2020-07-25 22:31:05 +03:00
parent ef607c6171
commit c62f97f67d
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/Reduce/remove-bbs-unwinded-to.ll Normal file
View File

@ -0,0 +1,39 @@
; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
; RUN: cat %t | FileCheck --check-prefixes=CHECK-ALL,CHECK-FINAL %s
declare i32 @maybe_throwing_callee()
; CHECK-ALL: declare void @did_not_throw(i32)
declare void @did_not_throw(i32)
declare void @thrown()
; CHECK-ALL: define void @caller()
define void @caller() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
; CHECK-ALL: bb:
bb:
; CHECK-INTERESTINGNESS: label %bb3
; CHECK-FINAL: br label %bb3
%i0 = invoke i32 @maybe_throwing_callee()
to label %bb3 unwind label %bb1
bb1:
landingpad { i8*, i32 } catch i8* null
call void @thrown()
br label %bb4
; CHECK-ALL: bb3:
bb3:
; CHECK-INTERESTINGNESS: call void @did_not_throw(i32
; CHECK-FINAL: call void @did_not_throw(i32 undef)
; CHECK-ALL: br label %bb4
call void @did_not_throw(i32 %i0)
br label %bb4
; CHECK-ALL: bb4:
; CHECK-ALL: ret void
bb4:
ret void
}
declare i32 @__gxx_personality_v0(...)

3
tools/llvm-reduce/deltas/ReduceBasicBlocks.cpp
View File

@ -36,11 +36,12 @@ static void replaceBranchTerminator(BasicBlock &BB,
if (ChunkSucessors.size() == Term->getNumSuccessors())
return;
bool IsBranch = isa<BranchInst>(Term);
bool IsBranch = isa<BranchInst>(Term) || isa<InvokeInst>(Term);
Value *Address = nullptr;
if (auto IndBI = dyn_cast<IndirectBrInst>(Term))
Address = IndBI->getAddress();
Term->replaceAllUsesWith(UndefValue::get(Term->getType()));
Term->eraseFromParent();
if (ChunkSucessors.empty()) {