[llvm-branch-commits] [llvm-branch] r101408 - in /llvm/branches/Apple/Hermes: ./ lib/Target/ARM/ARMISelDAGToDAG.cpp test/CodeGen/Thumb2/2010-04-15-DynAllocBug.ll

[Jim Grosbach]

Author: grosbach
Date: Thu Apr 15 17:18:14 2010
New Revision: 101408

URL: http://llvm.org/viewvc/llvm-project?rev=101408&view=rev
Log:
merge 101383

Added:
    llvm/branches/Apple/Hermes/test/CodeGen/Thumb2/2010-04-15-DynAllocBug.ll
      - copied unchanged from r101383, llvm/trunk/test/CodeGen/Thumb2/2010-04-15-DynAllocBug.ll
Modified:
    llvm/branches/Apple/Hermes/   (props changed)
    llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelDAGToDAG.cpp

Propchange: llvm/branches/Apple/Hermes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 15 17:18:14 2010
@@ -1 +1 @@
-/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210,98270,98395,98398,98402,98409,98416,98427,98561,98586,98845,98977,99043,99630,99678,100568,100892,101181,101282,101303
+/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210,98270,98395,98398,98402,98409,98416,98427,98561,98586,98845,98977,99043,99630,99678,100568,100892,101181,101282,101303,101383

Modified: llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelDAGToDAG.cpp?rev=101408&r1=101407&r2=101408&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelDAGToDAG.cpp (original)
+++ llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelDAGToDAG.cpp Thu Apr 15 17:18:14 2010
@@ -955,7 +955,7 @@
   SDValue Chain = N->getOperand(0);
   SDValue Size = N->getOperand(1);
   SDValue Align = N->getOperand(2);
-  SDValue SP = CurDAG->getRegister(ARM::SP, MVT::i32);
+  SDValue SP = CurDAG->getCopyFromReg(Chain, dl, ARM::SP, MVT::i32);
   int32_t AlignVal = cast<ConstantSDNode>(Align)->getSExtValue();
   if (AlignVal < 0)
     // We need to align the stack. Use Thumb1 tAND which is the only thumb