RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix return status of SimplifyCFG

Browse Source 
When a switch case is folded into default's case, that's an IR change that
should be reported, update ConstantFoldTerminator accordingly.

Differential Revision: https://reviews.llvm.org/D87142
This commit is contained in:
serge-sans-paille 2020-09-04 15:36:48 +02:00
parent 6da3508c40
commit 32b636840a
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Transforms/Utils/Local.cpp
View File

@ -182,6 +182,8 @@ bool llvm::ConstantFoldTerminator(BasicBlock *BB, bool DeleteDeadConditions,
TheOnlyDest = SI->case_begin()->getCaseSuccessor();
}
bool Changed = false;
// Figure out which case it goes to.
for (auto i = SI->case_begin(), e = SI->case_end(); i != e;) {
// Found case matching a constant operand?
@ -220,6 +222,7 @@ bool llvm::ConstantFoldTerminator(BasicBlock *BB, bool DeleteDeadConditions,
DefaultDest->removePredecessor(ParentBB);
i = SI->removeCase(i);
e = SI->case_end();
Changed = true;
if (DTU)
DTU->applyUpdatesPermissive(
{{DominatorTree::Delete, ParentBB, DefaultDest}});
@ -308,7 +311,7 @@ bool llvm::ConstantFoldTerminator(BasicBlock *BB, bool DeleteDeadConditions,
SI->eraseFromParent();
return true;
}
return false;
return Changed;
}
if (auto *IBI = dyn_cast<IndirectBrInst>(T)) {

45
test/Transforms/SimplifyCFG/merge-default.ll Normal file
View File

@ -0,0 +1,45 @@
; RUN: opt -simplifycfg -S < %s | FileCheck %s
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
declare void @g()
declare void @f()
define void @foo(i32 %Kind) {
; CHECK-LABEL: @foo(
; CHECK-NEXT:entry:
; CHECK-NEXT: switch i32 %Kind, label %sw.epilog [
; CHECK-NEXT: i32 15, label %sw.bb2
; CHECK-NEXT: i32 2, label %sw.bb
; CHECK-NEXT: ]
; CHECK: sw.bb:
; CHECK-NEXT: call void @g()
; CHECK-NEXT: call void @g()
; CHECK-NEXT: br label %sw.epilog
; CHECK: sw.bb2:
; CHECK-NEXT: call void @f()
; CHECK-NEXT: br label %sw.epilog
; CHECK: sw.epilog:
; CHECK-NEXT: ret void
; CHECK-NEXT:}
entry:
switch i32 %Kind, label %sw.epilog [
i32 1, label %sw.epilog
i32 2, label %sw.bb
i32 15, label %sw.bb2
]
sw.bb:
call void @g()
call void @g()
br label %sw.epilog
sw.bb2:
call void @f()
br label %sw.epilog
sw.epilog:
ret void
}