From f3db6b855e9c6b7d5d6a0a1fa52f5391921fa9ba Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 27 Apr 2012 23:37:41 +0000 Subject: [PATCH] Revert r155745 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155746 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86FastISel.cpp | 2 -- test/CodeGen/X86/fast-isel-x86.ll | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index d757926c715..eca0e780828 100644 --- 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 bd5c91491e0..b9598bb465c 100644 --- 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) -- 2.34.1