From dada95b5b3acbce56440124c242673f30f596f92 Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Mon, 8 Jun 2009 22:57:18 +0000 Subject: [PATCH] Revert hunk commited by accident git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73097 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMISelDAGToDAG.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/Target/ARM/ARMISelDAGToDAG.cpp b/lib/Target/ARM/ARMISelDAGToDAG.cpp index a413ee6f3e0..ca3a9cb4032 100644 --- a/lib/Target/ARM/ARMISelDAGToDAG.cpp +++ b/lib/Target/ARM/ARMISelDAGToDAG.cpp @@ -549,10 +549,6 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) { switch (N->getOpcode()) { default: break; case ISD::Constant: { - // ARMv6T2 and later should materialize imms via MOV / MOVT pair. - if (Subtarget->hasV6T2Ops()) - break; - unsigned Val = cast(N)->getZExtValue(); bool UseCP = true; if (Subtarget->isThumb()) @@ -563,7 +559,6 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) { UseCP = (ARM_AM::getSOImmVal(Val) == -1 && // MOV ARM_AM::getSOImmVal(~Val) == -1 && // MVN !ARM_AM::isSOImmTwoPartVal(Val)); // two instrs. - if (UseCP) { SDValue CPIdx = CurDAG->getTargetConstantPool(ConstantInt::get(Type::Int32Ty, Val), @@ -575,7 +570,7 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) { CPIdx, CurDAG->getEntryNode()); else { SDValue Ops[] = { - CPIdx, + CPIdx, CurDAG->getRegister(0, MVT::i32), CurDAG->getTargetConstant(0, MVT::i32), getAL(CurDAG), @@ -588,7 +583,7 @@ SDNode *ARMDAGToDAGISel::Select(SDValue Op) { ReplaceUses(Op, SDValue(ResNode, 0)); return NULL; } - + // Other cases are autogenerated. break; }