[llvm-commits] [llvm] r117322 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/stdcall-notailcall.ll

[Dale Johannesen]

Author: johannes
Date: Mon Oct 25 17:17:05 2010
New Revision: 117322

URL: http://llvm.org/viewvc/llvm-project?rev=117322&view=rev
Log:
An stdcall function calling a non-stdcall function
cannot use tailcall.  PR 8461.


Added:
    llvm/trunk/test/CodeGen/X86/stdcall-notailcall.ll
Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=117322&r1=117321&r2=117322&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Oct 25 17:17:05 2010
@@ -2532,6 +2532,11 @@
     }
   }
 
+  // An stdcall caller is expected to clean up its arguments; the callee
+  // isn't going to do that.   PR 8461.
+  if (!CCMatch && CallerCC==CallingConv::X86_StdCall)
+    return false;
+
   return true;
 }
 

Added: llvm/trunk/test/CodeGen/X86/stdcall-notailcall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stdcall-notailcall.ll?rev=117322&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/stdcall-notailcall.ll (added)
+++ llvm/trunk/test/CodeGen/X86/stdcall-notailcall.ll Mon Oct 25 17:17:05 2010
@@ -0,0 +1,13 @@
+; RUN: llc -mtriple=i386-apple-darwin11 -O2 < %s | FileCheck %s
+
+%struct.I = type { i32 (...)** }
+define x86_stdcallcc void @bar(%struct.I* nocapture %this) ssp align 2 {
+; CHECK: bar:
+; CHECK-NOT: jmp
+; CHECK: ret $4
+entry:
+  tail call void @foo()
+  ret void
+}
+
+declare void @foo()