[llvm-branch-commits] [llvm-branch] r99955 - in /llvm/branches/release_27: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/sibcall.ll

[Tanya Lattner]

Author: tbrethou
Date: Tue Mar 30 18:01:26 2010
New Revision: 99955

URL: http://llvm.org/viewvc/llvm-project?rev=99955&view=rev
Log:
Merge 99620 from mainline.
Do not sibcall if stack needs to be dynamically aligned.

Modified:
    llvm/branches/release_27/lib/Target/X86/X86ISelLowering.cpp
    llvm/branches/release_27/test/CodeGen/X86/sibcall.ll

Modified: llvm/branches/release_27/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/lib/Target/X86/X86ISelLowering.cpp?rev=99955&r1=99954&r2=99955&view=diff
==============================================================================
--- llvm/branches/release_27/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/release_27/lib/Target/X86/X86ISelLowering.cpp Tue Mar 30 18:01:26 2010
@@ -2307,6 +2307,7 @@
     return false;
 
   // If -tailcallopt is specified, make fastcc functions tail-callable.
+  const MachineFunction &MF = DAG.getMachineFunction();
   const Function *CallerF = DAG.getMachineFunction().getFunction();
   if (GuaranteedTailCallOpt) {
     if (IsTailCallConvention(CalleeCC) &&
@@ -2318,6 +2319,11 @@
   // Look for obvious safe cases to perform tail call optimization that does not
   // requite ABI changes. This is what gcc calls sibcall.
 
+  // Can't do sibcall if stack needs to be dynamically re-aligned. PEI needs to
+  // emit a special epilogue.
+  if (RegInfo->needsStackRealignment(MF))
+    return false;
+
   // Do not sibcall optimize vararg calls for now.
   if (isVarArg)
     return false;

Modified: llvm/branches/release_27/test/CodeGen/X86/sibcall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/test/CodeGen/X86/sibcall.ll?rev=99955&r1=99954&r2=99955&view=diff
==============================================================================
--- llvm/branches/release_27/test/CodeGen/X86/sibcall.ll (original)
+++ llvm/branches/release_27/test/CodeGen/X86/sibcall.ll Tue Mar 30 18:01:26 2010
@@ -216,3 +216,16 @@
 }
 
 declare fastcc %struct.ns* @foo7(%struct.cp* byval align 4, i8 signext) nounwind ssp
+
+
+
+define void @t19() alignstack(32) nounwind {
+entry:
+; CHECK: t19:
+; CHECK: andl $-32
+; CHECK: call {{_?}}foo
+  tail call void @foo() nounwind
+  ret void
+}
+
+declare void @foo()