]> granicus.if.org Git - llvm/commit
Merging r196493. Simple conflict due to change API of updated
authorTim Northover <tnorthover@apple.com>
Sun, 8 Dec 2013 08:12:20 +0000 (08:12 +0000)
committerTim Northover <tnorthover@apple.com>
Sun, 8 Dec 2013 08:12:20 +0000 (08:12 +0000)
commite8098892f517c492193f8f8ebdcbb861d7a7b54a
treee42e27dc1a48051ae60b8ceaf5f6112eb3478de1
parent209178dacacb5c254926a9d8c72933f23feced9f
Merging r196493. Simple conflict due to change API of updated
function.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196717 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Target/ARM/ARMFrameLowering.cpp
test/CodeGen/ARM/fold-stack-adjust.ll