[llvm-commits] [llvm] r43211 - /llvm/trunk/lib/CodeGen/VirtRegMap.cpp

[Evan Cheng]

Author: evancheng
Date: Sun Oct 21 22:01:44 2007
New Revision: 43211

URL: http://llvm.org/viewvc/llvm-project?rev=43211&view=rev
Log:
- Only perform the unfolding optimization when the folding in question is modref.
- Remove a bogus assertion.

Modified:
    llvm/trunk/lib/CodeGen/VirtRegMap.cpp

Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=43211&r1=43210&r2=43211&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original)
+++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Sun Oct 21 22:01:44 2007
@@ -821,11 +821,8 @@
       unsigned Idx = NewMI->findRegisterUseOperandIdx(VirtReg);
       MachineInstr *FoldedMI = MRI->foldMemoryOperand(NewMI, Idx, SS);
       if (FoldedMI) {
-        if (VRM.hasPhys(UnfoldVR))
-          assert(VRM.getPhys(UnfoldVR) == UnfoldPR);
-        else
+        if (!VRM.hasPhys(UnfoldVR))
           VRM.assignVirt2Phys(UnfoldVR, UnfoldPR);
-
         VRM.virtFolded(VirtReg, FoldedMI, VirtRegMap::isRef);
         MII = MBB.insert(MII, FoldedMI);
         VRM.RemoveFromFoldedVirtMap(&MI);
@@ -1190,7 +1187,7 @@
       if (DeadStore) {
         bool isDead = !(MR & VirtRegMap::isRef);
         MachineInstr *NewStore = NULL;
-        if (MR & VirtRegMap::isMod) {
+        if (MR & VirtRegMap::isModRef) {
           unsigned PhysReg = Spills.getSpillSlotOrReMatPhysReg(SS);
           SmallVector<MachineInstr*, 4> NewMIs;
           if (PhysReg &&