forked from OSchip/llvm-project
Fix LCSSA to avoid emitting a PHI node for the unwind destination of
an invoke instruction, since the value isn't really live across that edge. llvm-svn: 74242
This commit is contained in:
Dan Gohman
parent
e2c4d35f3e
commit
7eaf50ecac
|
|
@ -149,7 +149,16 @@ void LCSSA::ProcessInstruction(Instruction *Instr,
|
|||
// Keep track of the blocks that have the value available already.
|
||||
DenseMap<DomTreeNode*, Value*> Phis;
|
||||
|
||||
DomTreeNode *InstrNode = DT->getNode(Instr->getParent());
|
||||
BasicBlock *DomBB = Instr->getParent();
|
||||
|
||||
// Invoke instructions are special in that their result value is not available
|
||||
// along their unwind edge. The code below tests to see whether DomBB dominates
|
||||
// the value, so adjust DomBB to the normal destination block, which is
|
||||
// effectively where the value is first usable.
|
||||
if (InvokeInst *Inv = dyn_cast<InvokeInst>(Instr))
|
||||
DomBB = Inv->getNormalDest();
|
||||
|
||||
DomTreeNode *DomNode = DT->getNode(DomBB);
|
||||
|
||||
// Insert the LCSSA phi's into the exit blocks (dominated by the value), and
|
||||
// add them to the Phi's map.
|
||||
|
|
@ -158,7 +167,7 @@ void LCSSA::ProcessInstruction(Instruction *Instr,
|
|||
BasicBlock *BB = *BBI;
|
||||
DomTreeNode *ExitBBNode = DT->getNode(BB);
|
||||
Value *&Phi = Phis[ExitBBNode];
|
||||
if (!Phi && DT->dominates(InstrNode, ExitBBNode)) {
|
||||
if (!Phi && DT->dominates(DomNode, ExitBBNode)) {
|
||||
PHINode *PN = PHINode::Create(Instr->getType(), Instr->getName()+".lcssa",
|
||||
BB->begin());
|
||||
PN->reserveOperandSpace(PredCache.GetNumPreds(BB));
|
||||
|
|
|
|||
|
|
@ -0,0 +1,143 @@
|
|||
; RUN: llvm-as < %s | opt -lcssa
|
||||
|
||||
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
|
||||
|
||||
@.str12 = external constant [3 x i8], align 1 ; <[3 x i8]*> [#uses=1]
|
||||
@.str17175 = external constant [4 x i8], align 1 ; <[4 x i8]*> [#uses=1]
|
||||
@.str21179 = external constant [12 x i8], align 1 ; <[12 x i8]*> [#uses=1]
|
||||
@.str25183 = external constant [10 x i8], align 1 ; <[10 x i8]*> [#uses=1]
|
||||
@.str32190 = external constant [92 x i8], align 1 ; <[92 x i8]*> [#uses=1]
|
||||
@.str41 = external constant [25 x i8], align 1 ; <[25 x i8]*> [#uses=1]
|
||||
|
||||
define void @_ZN8EtherBus10initializeEv() {
|
||||
entry:
|
||||
br i1 undef, label %_ZN7cObjectnwEj.exit, label %bb.i
|
||||
|
||||
bb.i: ; preds = %entry
|
||||
br label %_ZN7cObjectnwEj.exit
|
||||
|
||||
_ZN7cObjectnwEj.exit: ; preds = %bb.i, %entry
|
||||
invoke void @_ZN7cObjectC2EPKc(i8* undef, i8* getelementptr ([12 x i8]* @.str21179, i32 0, i32 0))
|
||||
to label %bb1 unwind label %lpad
|
||||
|
||||
bb1: ; preds = %_ZN7cObjectnwEj.exit
|
||||
br i1 undef, label %_ZNK5cGate4sizeEv.exit, label %bb.i110
|
||||
|
||||
bb.i110: ; preds = %bb1
|
||||
br label %_ZNK5cGate4sizeEv.exit
|
||||
|
||||
_ZNK5cGate4sizeEv.exit: ; preds = %bb.i110, %bb1
|
||||
br i1 undef, label %_ZNK5cGate4sizeEv.exit122, label %bb.i120
|
||||
|
||||
bb.i120: ; preds = %_ZNK5cGate4sizeEv.exit
|
||||
br label %_ZNK5cGate4sizeEv.exit122
|
||||
|
||||
_ZNK5cGate4sizeEv.exit122: ; preds = %bb.i120, %_ZNK5cGate4sizeEv.exit
|
||||
br i1 undef, label %bb8, label %bb2
|
||||
|
||||
bb2: ; preds = %_ZNK5cGate4sizeEv.exit122
|
||||
unreachable
|
||||
|
||||
bb8: ; preds = %_ZNK5cGate4sizeEv.exit122
|
||||
%tmp = invoke i8* @_ZN7cModule3parEPKc(i8* undef, i8* getelementptr ([10 x i8]* @.str25183, i32 0, i32 0))
|
||||
to label %invcont9 unwind label %lpad119 ; <i8*> [#uses=1]
|
||||
|
||||
invcont9: ; preds = %bb8
|
||||
%tmp1 = invoke i8* @_ZN4cPar11stringValueEv(i8* %tmp)
|
||||
to label %invcont10 unwind label %lpad119 ; <i8*> [#uses=1]
|
||||
|
||||
invcont10: ; preds = %invcont9
|
||||
invoke void @_ZN8EtherBus8tokenizeEPKcRSt6vectorIdSaIdEE(i8* null, i8* %tmp1, i8* undef)
|
||||
to label %invcont11 unwind label %lpad119
|
||||
|
||||
invcont11: ; preds = %invcont10
|
||||
br i1 undef, label %bb12, label %bb18
|
||||
|
||||
bb12: ; preds = %invcont11
|
||||
invoke void (i8*, i8*, ...)* @_ZN6cEnvir6printfEPKcz(i8* null, i8* getelementptr ([3 x i8]* @.str12, i32 0, i32 0), i32 undef)
|
||||
to label %bb.i.i159 unwind label %lpad119
|
||||
|
||||
bb.i.i159: ; preds = %bb12
|
||||
unreachable
|
||||
|
||||
bb18: ; preds = %invcont11
|
||||
br i1 undef, label %bb32, label %bb34
|
||||
|
||||
bb32: ; preds = %bb18
|
||||
br i1 undef, label %bb.i.i123, label %bb34
|
||||
|
||||
bb.i.i123: ; preds = %bb32
|
||||
br label %bb34
|
||||
|
||||
bb34: ; preds = %bb.i.i123, %bb32, %bb18
|
||||
%tmp2 = invoke i8* @_Znaj(i32 undef)
|
||||
to label %invcont35 unwind label %lpad119 ; <i8*> [#uses=0]
|
||||
|
||||
invcont35: ; preds = %bb34
|
||||
br i1 undef, label %bb49, label %bb61
|
||||
|
||||
bb49: ; preds = %invcont35
|
||||
invoke void (i8*, i8*, ...)* @_ZNK13cSimpleModule5errorEPKcz(i8* undef, i8* getelementptr ([92 x i8]* @.str32190, i32 0, i32 0))
|
||||
to label %bb51 unwind label %lpad119
|
||||
|
||||
bb51: ; preds = %bb49
|
||||
unreachable
|
||||
|
||||
bb61: ; preds = %invcont35
|
||||
br label %bb106
|
||||
|
||||
.noexc: ; preds = %bb106
|
||||
invoke void @_ZN7cObjectC2EPKc(i8* undef, i8* getelementptr ([25 x i8]* @.str41, i32 0, i32 0))
|
||||
to label %bb102 unwind label %lpad123
|
||||
|
||||
bb102: ; preds = %.noexc
|
||||
invoke void undef(i8* undef, i8 zeroext 1)
|
||||
to label %invcont103 unwind label %lpad119
|
||||
|
||||
invcont103: ; preds = %bb102
|
||||
invoke void undef(i8* undef, double 1.000000e+07)
|
||||
to label %invcont104 unwind label %lpad119
|
||||
|
||||
invcont104: ; preds = %invcont103
|
||||
%tmp3 = invoke i32 @_ZN13cSimpleModule11sendDelayedEP8cMessagedPKci(i8* undef, i8* undef, double 0.000000e+00, i8* getelementptr ([4 x i8]* @.str17175, i32 0, i32 0), i32 undef)
|
||||
to label %invcont105 unwind label %lpad119 ; <i32> [#uses=0]
|
||||
|
||||
invcont105: ; preds = %invcont104
|
||||
br label %bb106
|
||||
|
||||
bb106: ; preds = %invcont105, %bb61
|
||||
%tmp4 = invoke i8* @_Znaj(i32 124)
|
||||
to label %.noexc unwind label %lpad119 ; <i8*> [#uses=1]
|
||||
|
||||
lpad: ; preds = %_ZN7cObjectnwEj.exit
|
||||
br label %Unwind
|
||||
|
||||
lpad119: ; preds = %bb106, %invcont104, %invcont103, %bb102, %bb49, %bb34, %bb12, %invcont10, %invcont9, %bb8
|
||||
unreachable
|
||||
|
||||
lpad123: ; preds = %.noexc
|
||||
%tmp5 = icmp eq i8* %tmp4, null ; <i1> [#uses=1]
|
||||
br i1 %tmp5, label %Unwind, label %bb.i2
|
||||
|
||||
bb.i2: ; preds = %lpad123
|
||||
br label %Unwind
|
||||
|
||||
Unwind: ; preds = %bb.i2, %lpad123, %lpad
|
||||
unreachable
|
||||
}
|
||||
|
||||
declare void @_ZN8EtherBus8tokenizeEPKcRSt6vectorIdSaIdEE(i8* nocapture, i8*, i8*)
|
||||
|
||||
declare i8* @_Znaj(i32)
|
||||
|
||||
declare void @_ZN6cEnvir6printfEPKcz(i8* nocapture, i8* nocapture, ...)
|
||||
|
||||
declare void @_ZNK13cSimpleModule5errorEPKcz(i8* nocapture, i8* nocapture, ...) noreturn
|
||||
|
||||
declare i8* @_ZN7cModule3parEPKc(i8*, i8*)
|
||||
|
||||
declare i32 @_ZN13cSimpleModule11sendDelayedEP8cMessagedPKci(i8*, i8*, double, i8*, i32)
|
||||
|
||||
declare void @_ZN7cObjectC2EPKc(i8*, i8*)
|
||||
|
||||
declare i8* @_ZN4cPar11stringValueEv(i8*)
|
||||
Loading…
Reference in New Issue