StructurizeCFG: Fix inverting a branch on an argument

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195492 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matt Arsenault 2013-11-22 19:24:37 +00:00
parent 16c7e0b48c
commit 7575fdd7a4
2 changed files with 69 additions and 11 deletions

View File

@ -323,21 +323,32 @@ Value *StructurizeCFG::invert(Value *Condition) {
if (match(Condition, m_Not(m_Value(Condition))))
return Condition;
// Third: Check all the users for an invert
BasicBlock *Parent = cast<Instruction>(Condition)->getParent();
for (Value::use_iterator I = Condition->use_begin(),
E = Condition->use_end(); I != E; ++I) {
if (Instruction *Inst = dyn_cast<Instruction>(Condition)) {
// Third: Check all the users for an invert
BasicBlock *Parent = Inst->getParent();
for (Value::use_iterator I = Condition->use_begin(),
E = Condition->use_end(); I != E; ++I) {
Instruction *User = dyn_cast<Instruction>(*I);
if (!User || User->getParent() != Parent)
continue;
Instruction *User = dyn_cast<Instruction>(*I);
if (!User || User->getParent() != Parent)
continue;
if (match(*I, m_Not(m_Specific(Condition))))
return *I;
if (match(*I, m_Not(m_Specific(Condition))))
return *I;
}
// Last option: Create a new instruction
return BinaryOperator::CreateNot(Condition, "", Parent->getTerminator());
}
// Last option: Create a new instruction
return BinaryOperator::CreateNot(Condition, "", Parent->getTerminator());
if (Argument *Arg = dyn_cast<Argument>(Condition)) {
BasicBlock &EntryBlock = Arg->getParent()->getEntryBlock();
return BinaryOperator::CreateNot(Condition,
Arg->getName() + ".inv",
EntryBlock.getTerminator());
}
llvm_unreachable("Unhandled condition to invert");
}
/// \brief Build the condition for one edge

View File

@ -0,0 +1,47 @@
; RUN: opt -S -o - -structurizecfg < %s | FileCheck %s
; CHECK-LABEL: @invert_branch_on_arg_inf_loop(
; CHECK: entry:
; CHECK: %arg.inv = xor i1 %arg, true
; CHECK: phi i1 [ false, %Flow1 ], [ %arg.inv, %entry ]
define void @invert_branch_on_arg_inf_loop(i32 addrspace(1)* %out, i1 %arg) {
entry:
br i1 %arg, label %for.end, label %for.body
for.body: ; preds = %entry, %for.body
store i32 999, i32 addrspace(1)* %out, align 4
br label %for.body
for.end: ; preds = %Flow
ret void
}
; CHECK-LABEL: @invert_branch_on_arg_jump_into_loop(
; CHECK: entry:
; CHECK: %arg.inv = xor i1 %arg, true
; CHECK: Flow:
; CHECK: Flow1:
define void @invert_branch_on_arg_jump_into_loop(i32 addrspace(1)* %out, i32 %n, i1 %arg) {
entry:
br label %for.body
for.body:
%i = phi i32 [0, %entry], [%i.inc, %end.loop]
%ptr = getelementptr i32 addrspace(1)* %out, i32 %i
store i32 %i, i32 addrspace(1)* %ptr, align 4
br i1 %arg, label %mid.loop, label %end.loop
mid.loop:
store i32 333, i32 addrspace(1)* %out, align 4
br label %for.end
end.loop:
%i.inc = add i32 %i, 1
%cmp = icmp ne i32 %i.inc, %n
br i1 %cmp, label %for.body, label %for.end
for.end:
ret void
}