diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2010-10-29 17:37:25 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2010-10-29 17:37:25 +0000 |
| commit | 2cdca458613622182d29214455f92ef4ce998c38 (patch) | |
| tree | 0a1721d3ffcbbfa0458e16a5bfa5759c5bf38ef7 /llvm/lib/CodeGen | |
| parent | 7d105260e3c263927ef51ed63d4d457cb8b5cb3f (diff) | |
| download | bcm5719-llvm-2cdca458613622182d29214455f92ef4ce998c38.tar.gz bcm5719-llvm-2cdca458613622182d29214455f92ef4ce998c38.zip | |
Never propagate the idom value out of a block that defines its own value.
llvm-svn: 117669
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/SplitKit.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/SplitKit.cpp b/llvm/lib/CodeGen/SplitKit.cpp index 70352fc1782..b5012f313b7 100644 --- a/llvm/lib/CodeGen/SplitKit.cpp +++ b/llvm/lib/CodeGen/SplitKit.cpp @@ -441,7 +441,8 @@ VNInfo *LiveIntervalMap::mapValue(const VNInfo *ParentVNI, SlotIndex Idx, if (VNInfo *VNI = extendTo(Pred, Last)) { MachineBasicBlock *DefMBB = lis_.getMBBFromIndex(VNI->def); DEBUG(dbgs() << " found valno #" << VNI->id - << " at BB#" << DefMBB->getNumber() << '\n'); + << " from BB#" << DefMBB->getNumber() + << " at BB#" << Pred->getNumber() << '\n'); LiveOutPair &LOP = LOIP.first->second; LOP.first = VNI; LOP.second = mdt_[lis_.getMBBFromIndex(VNI->def)]; @@ -528,11 +529,14 @@ VNInfo *LiveIntervalMap::mapValue(const VNInfo *ParentVNI, SlotIndex Idx, I->second = LiveOutPair(VNI, Node); } } else if (IDomValue.first) { - // No phi-def here. Propagate IDomValue if needed. + // No phi-def here. Remember incoming value for IdxMBB. if (MBB == IdxMBB) IdxVNI = IDomValue.first; + // Propagate IDomValue if needed: + // MBB is live-out and doesn't define its own value. LiveOutMap::iterator I = liveOutCache_.find(MBB); - if (I != liveOutCache_.end() && I->second.first != IDomValue.first) { + if (I != liveOutCache_.end() && I->second.second != Node && + I->second.first != IDomValue.first) { ++Changes; I->second = IDomValue; DEBUG(dbgs() << " - BB#" << MBB->getNumber() |
