From 2c0565f8e0a2306d3ea746722113ace2a53921c8 Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Wed, 1 Nov 2006 22:26:43 +0000 Subject: [PATCH] Handle PHINode with only one incoming value. This fixes http://llvm.org/bugs/show_bug.cgi?id=979 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31358 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/CondPropagate.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/Transforms/Scalar/CondPropagate.cpp b/lib/Transforms/Scalar/CondPropagate.cpp index 5eb5abd9f87..d7aa7eca266 100644 --- a/lib/Transforms/Scalar/CondPropagate.cpp +++ b/lib/Transforms/Scalar/CondPropagate.cpp @@ -196,11 +196,15 @@ void CondProp::RevectorBlockTo(BasicBlock *FromBB, BasicBlock *ToBB) { // Get the old block we are threading through. BasicBlock *OldSucc = FromBr->getSuccessor(0); - // ToBB should not have any PHI nodes in it to update, because OldSucc had - // multiple successors. If OldSucc had multiple successor and ToBB had - // multiple predecessors, the edge between them would be critical, which we - // already took care of. - assert(!isa(ToBB->begin()) && "Critical Edge Found!"); + // OldSucc had multiple successors. If ToBB has multiple predecessors, the + // edge between them would be critical, which we already took care of. + // If ToBB has single operand PHI node than take care of it here. + if (isa(ToBB->begin())) { + PHINode *PN = cast(ToBB->begin()); + assert(PN->getNumIncomingValues() == 1 && "Critical Edge Found!"); + PN->replaceAllUsesWith(PN->getIncomingValue(0)); + PN->eraseFromParent(); + } // Update PHI nodes in OldSucc to know that FromBB no longer branches to it. OldSucc->removePredecessor(FromBB); -- 2.34.1