[llvm-commits] [llvm] r153593 - in /llvm/trunk/lib/Target/ARM: ARMLoadStoreOptimizer.cpp Thumb2ITBlockPass.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Mar 28 15:11:44 2012
New Revision: 153593

URL: http://llvm.org/viewvc/llvm-project?rev=153593&view=rev
Log:
Revert r153516: "Invalidate liveness in Thumb2ITBlockPass."
Revert r153519: "ARMLoadStoreOptimizer invalidates register liveness."

These patches caused miscompilations in povray by turning off branch
folding's updating of live-in lists.

It turns out the the late scheduler depends on the live-in lists, even
if it doesn't need correct kill flags.

<rdar://problem/11139228>

Modified:
    llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
    llvm/trunk/lib/Target/ARM/Thumb2ITBlockPass.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=153593&r1=153592&r2=153593&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Wed Mar 28 15:11:44 2012
@@ -1411,10 +1411,6 @@
   }
 
   delete RS;
-
-  // Kill flags aren't updated accurately by this pass.
-  Fn.getRegInfo().invalidateLiveness();
-
   return Modified;
 }
 

Modified: llvm/trunk/lib/Target/ARM/Thumb2ITBlockPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Thumb2ITBlockPass.cpp?rev=153593&r1=153592&r2=153593&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Thumb2ITBlockPass.cpp (original)
+++ llvm/trunk/lib/Target/ARM/Thumb2ITBlockPass.cpp Wed Mar 28 15:11:44 2012
@@ -15,7 +15,6 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineInstrBundle.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
 using namespace llvm;
@@ -259,9 +258,6 @@
   if (!AFI->isThumbFunction())
     return false;
 
-  // IT block insertion invalidates accurate register liveness.
-  Fn.getRegInfo().invalidateLiveness();
-
   bool Modified = false;
   for (MachineFunction::iterator MFI = Fn.begin(), E = Fn.end(); MFI != E; ) {
     MachineBasicBlock &MBB = *MFI;