<p dir="ltr">Test?<br>
</p>
<br><div class="gmail_quote"><div dir="ltr">On Wed, Jul 15, 2015, 5:07 PM Guozhi Wei <<a href="mailto:carrot@google.com">carrot@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Carrot created this revision.<br>
Carrot added a subscriber: llvm-commits.<br>
Herald added a subscriber: aemerson.<br>
<br>
Function getSPAdjust doesn't consider the stack alignment, its usage in PEI::replaceFrameIndices causes wrong offset is used for stack objects.<br>
<br>
This patch adds a function to align the SP adjustment to the correct alignment, and call it from getSPAdjust and ARM backend. It can/should also be used by other backends if SP adjustment is need to be aligned.<br>
<br>
<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D11249&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=H5W3OM_qGOCEUj64p4ofCAKVYlUkTNYtshI1dY0NPgw&s=af3t6a50eq6bNLjzRs1ap8A8KtyL4E3zJ9qwvFmD38Y&e=" rel="noreferrer" target="_blank">http://reviews.llvm.org/D11249</a><br>
<br>
Files:<br>
  include/llvm/Target/TargetFrameLowering.h<br>
  lib/CodeGen/TargetInstrInfo.cpp<br>
  lib/Target/ARM/ARMFrameLowering.cpp<br>
<br>
Index: lib/Target/ARM/ARMFrameLowering.cpp<br>
===================================================================<br>
--- lib/Target/ARM/ARMFrameLowering.cpp<br>
+++ lib/Target/ARM/ARMFrameLowering.cpp<br>
@@ -1783,8 +1783,7 @@<br>
       // We need to keep the stack aligned properly.  To do this, we round the<br>
       // amount of space needed for the outgoing arguments up to the next<br>
       // alignment boundary.<br>
-      unsigned Align = getStackAlignment();<br>
-      Amount = (Amount+Align-1)/Align*Align;<br>
+      Amount = alignSPAdjust(Amount);<br>
<br>
       ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();<br>
       assert(!AFI->isThumb1OnlyFunction() &&<br>
Index: lib/CodeGen/TargetInstrInfo.cpp<br>
===================================================================<br>
--- lib/CodeGen/TargetInstrInfo.cpp<br>
+++ lib/CodeGen/TargetInstrInfo.cpp<br>
@@ -661,6 +661,7 @@<br>
     return 0;<br>
<br>
   int SPAdj = MI->getOperand(0).getImm();<br>
+  SPAdj = TFI->alignSPAdjust(SPAdj);<br>
<br>
   if ((!StackGrowsDown && MI->getOpcode() == FrameSetupOpcode) ||<br>
        (StackGrowsDown && MI->getOpcode() == FrameDestroyOpcode))<br>
Index: include/llvm/Target/TargetFrameLowering.h<br>
===================================================================<br>
--- include/llvm/Target/TargetFrameLowering.h<br>
+++ include/llvm/Target/TargetFrameLowering.h<br>
@@ -69,6 +69,20 @@<br>
   ///<br>
   unsigned getStackAlignment() const { return StackAlignment; }<br>
<br>
+  /// alignSPAdjust - This method aligns the stack adjustment to the correct<br>
+  /// alignment.<br>
+  ///<br>
+  int alignSPAdjust(int SPAdj) const {<br>
+    if (SPAdj < 0) {<br>
+      SPAdj = -SPAdj;<br>
+      SPAdj = (SPAdj + StackAlignment - 1) / StackAlignment * StackAlignment;<br>
+      SPAdj = -SPAdj;<br>
+    } else {<br>
+      SPAdj = (SPAdj + StackAlignment - 1) / StackAlignment * StackAlignment;<br>
+    }<br>
+    return SPAdj;<br>
+  }<br>
+<br>
   /// getTransientStackAlignment - This method returns the number of bytes to<br>
   /// which the stack pointer must be aligned at all times, even between<br>
   /// calls.<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>