Revert r155745

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155746 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp
index d757926c715ad37bf71a058ac25b1ede26801688..eca0e780828861cd648be5b7e988d3be5c03ad05 100644 (file)
--- a/lib/Target/X86/X86FastISel.cpp
+++ b/lib/Target/X86/X86FastISel.cpp
@@ -1858,8 +1858,6 @@ bool X86FastISel::DoSelectCall(const Instruction *I, const char *MemIntName) {
   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))

diff --git a/test/CodeGen/X86/fast-isel-x86.ll b/test/CodeGen/X86/fast-isel-x86.ll
index bd5c91491e09654f40c7c96d6396362a5d09386f..b9598bb465ce4f446735e1cca399e83b502a5b59 100644 (file)
--- a/test/CodeGen/X86/fast-isel-x86.ll
+++ b/test/CodeGen/X86/fast-isel-x86.ll
@@ -46,17 +46,3 @@ entry:
 ; 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)