diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-02-22 03:24:52 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-02-22 03:24:52 +0000 |
| commit | 4ecc82e592745d6995db83ea158b3c15011a84f8 (patch) | |
| tree | 51d712505461ec31550116b8bfea64e48ad17fcf /lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | |
| parent | ec243ae2b859487bd417a1289da2a4a5901c3469 (diff) | |
| download | external_llvm-4ecc82e592745d6995db83ea158b3c15011a84f8.zip external_llvm-4ecc82e592745d6995db83ea158b3c15011a84f8.tar.gz external_llvm-4ecc82e592745d6995db83ea158b3c15011a84f8.tar.bz2 | |
Roll out r126169 and r126170 in an attempt to fix the selfhost bot.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126185 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index c1be3e9..452f561 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -644,10 +644,7 @@ SDValue RegsForValue::getCopyFromRegs(SelectionDAG &DAG, !RegisterVT.isInteger() || RegisterVT.isVector() || !FuncInfo.LiveOutRegInfo.inBounds(Regs[Part+i])) continue; - - if (FuncInfo.PHIDestRegs.count(Regs[Part+i]) && !FuncInfo.AllPredsVisited) - continue; - + const FunctionLoweringInfo::LiveOutInfo &LOI = FuncInfo.LiveOutRegInfo[Regs[Part+i]]; @@ -6469,9 +6466,6 @@ SelectionDAGBuilder::HandlePHINodesInSuccessorBlocks(const BasicBlock *LLVMBB) { } } - if (!EnableFastISel) - FuncInfo.PHISrcToDestMap[Reg] = FuncInfo.ValueMap[PN]; - // Remember that this register needs to added to the machine PHI node as // the input for this MBB. SmallVector<EVT, 4> ValueVTs; |