From 64beb47783d4ebc9b6b33993672cea1c6fa262ae Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Thu, 7 Apr 2011 18:43:14 +0000 Subject: [PATCH] Recompute hasPHIKill flags when shrinking live intervals. PHI values may be deleted, causing the flags to be wrong. This fixes PR9616. llvm-svn: 129092 --- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp index 07f83ea7cefb..c77ae1b7a793 100644 --- a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -787,6 +787,8 @@ bool LiveIntervals::shrinkToUses(LiveInterval *li, VNInfo *VNI = *I; if (VNI->isUnused()) continue; + // We may eliminate PHI values, so recompute PHIKill flags. + VNI->setHasPHIKill(false); NewLI.addRange(LiveRange(VNI->def, VNI->def.getNextSlot(), VNI)); // A use tied to an early-clobber def ends at the load slot and isn't caught @@ -822,7 +824,7 @@ bool LiveIntervals::shrinkToUses(LiveInterval *li, VNInfo *PVNI = li->getVNInfoAt(Stop); // A predecessor is not required to have a live-out value for a PHI. if (PVNI) { - assert(PVNI->hasPHIKill() && "Missing hasPHIKill flag"); + PVNI->setHasPHIKill(true); WorkList.push_back(std::make_pair(Stop, PVNI)); } }