From 9ae4b271f204caf152a25eb693c133fd008772a4 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Wed, 15 Sep 2010 16:53:07 +0000
Subject: [PATCH] the darwin9-powerpc buildbot keeps consistently crashing,
 backing out following to get it back to green, so I can investigate in peace:

svn merge -c -113840  llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
svn merge -c -113876 -c -113839 llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp

llvm-svn: 113980
---
 llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp      | 16 ----------------
 llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll |  3 ++-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
index 315ddcbc7e1d..864c5f9dbbd8 100644
--- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
@@ -1352,20 +1352,6 @@ AnalyzeCompare(const MachineInstr *MI, unsigned &SrcReg, int &CmpValue) const {
     SrcReg = MI->getOperand(0).getReg();
     CmpValue = MI->getOperand(1).getImm();
     return true;
-  case ARM::TSTri: {
-      if (&*MI->getParent()->begin() == MI)
-        return false;
-      const MachineInstr *AND = llvm::prior(MI);
-      if (AND->getOpcode() != ARM::ANDri)
-        return false;
-      if (MI->getOperand(0).getReg() == AND->getOperand(1).getReg() &&
-          MI->getOperand(1).getImm() == AND->getOperand(2).getImm()) {
-        SrcReg = AND->getOperand(0).getReg();
-        CmpValue = 0;
-        return true;
-      }
-    }
-    break;
   }
 
   return false;
@@ -1415,8 +1401,6 @@ OptimizeCompareInstr(MachineInstr *CmpInstr, unsigned SrcReg, int CmpValue,
   switch (MI->getOpcode()) {
   default: break;
   case ARM::ADDri:
-  case ARM::ANDri:
-  case ARM::t2ANDri:
   case ARM::SUBri:
   case ARM::t2ADDri:
   case ARM::t2SUBri:
diff --git a/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll b/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
index 8d42a794feee..77bc9eec1afb 100644
--- a/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
+++ b/llvm/test/CodeGen/ARM/arm-and-tst-peephole.ll
@@ -17,7 +17,8 @@ tailrecurse:                                      ; preds = %sw.bb, %entry
   %tmp2 = load i8** %scevgep5
   %0 = ptrtoint i8* %tmp2 to i32
 
-; CHECK:      ands r12, r12, #3
+; CHECK:      and lr, r12, #3
+; CHECK-NEXT: tst r12, #3
 ; CHECK-NEXT: beq LBB0_4
 
 ; T2:      movs r5, #3