[llvm-commits] [llvm] r155746 - in /llvm/trunk: lib/Target/X86/X86FastISel.cpp test/CodeGen/X86/fast-isel-x86.ll

[Derek Schuff]

Author: dschuff
Date: Fri Apr 27 18:37:41 2012
New Revision: 155746

URL: http://llvm.org/viewvc/llvm-project?rev=155746&view=rev
Log:
Revert r155745


Modified:
    llvm/trunk/lib/Target/X86/X86FastISel.cpp
    llvm/trunk/test/CodeGen/X86/fast-isel-x86.ll

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=155746&r1=155745&r2=155746&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Fri Apr 27 18:37:41 2012
@@ -1858,8 +1858,6 @@
   unsigned AdjStackUp = TII.getCallFrameDestroyOpcode();
   unsigned NumBytesCallee = 0;
   if (!Subtarget->is64Bit() && !Subtarget->isTargetWindows() &&
-      !(CS.getCallingConv() == CallingConv::Fast ||
-        CS.getCallingConv() == CallingConv::GHC) &&
       CS.paramHasAttr(1, Attribute::StructRet))
     NumBytesCallee = 4;
   BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(AdjStackUp))

Modified: llvm/trunk/test/CodeGen/X86/fast-isel-x86.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-x86.ll?rev=155746&r1=155745&r2=155746&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fast-isel-x86.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fast-isel-x86.ll Fri Apr 27 18:37:41 2012
@@ -46,17 +46,3 @@
 ; CHECK: addl $40
 }
 declare void @test3sret(%struct.a* sret)
-
-; Check that fast-isel sret works with fastcc (and does not callee-pop)
-define void @test4() nounwind ssp {
-entry:
-  %tmp = alloca %struct.a, align 8
-  call fastcc void @test4fastccsret(%struct.a* sret %tmp)
-  ret void
-; CHECK: test4:
-; CHECK: subl $44
-; CHECK: leal 16(%esp)
-; CHECK: calll _test4fastccsret
-; CHECK addl $40
-}
-declare fastcc void @test4fastccsret(%struct.a* sret)