diff options
| author | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2011-03-02 21:36:49 +0000 |
|---|---|---|
| committer | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2011-03-02 21:36:49 +0000 |
| commit | 9c6082fe89c61af697f017aa80937581cc2128d8 (patch) | |
| tree | a584f24f02bbaa5188567583995a02ea6ece0ee2 /lib/CodeGen/CGVTables.cpp | |
| parent | 9a7e09d82f739c8fd1b6c28787397d698515a871 (diff) | |
Revert "Add CC_Win64ThisCall and set it in the necessary places."
This reverts commit 126863.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126886 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | lib/CodeGen/CGVTables.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp index 6acbe436c8..891697f4cd 100644 --- a/lib/CodeGen/CGVTables.cpp +++ b/lib/CodeGen/CGVTables.cpp @@ -2582,11 +2582,8 @@ void CodeGenFunction::GenerateThunk(llvm::Function *Fn, GlobalDecl GD, FunctionArgs.push_back(std::make_pair(Param, Param->getType())); } - - const bool IsWin64 = CGM.getContext().Target.isWin64(); - - StartFunction(GlobalDecl(), ResultType, Fn, FunctionArgs, SourceLocation(), - IsWin64 ? CC_Win64ThisCall : CC_Default); + + StartFunction(GlobalDecl(), ResultType, Fn, FunctionArgs, SourceLocation()); CGM.getCXXABI().EmitInstanceFunctionProlog(*this); @@ -2617,14 +2614,9 @@ void CodeGenFunction::GenerateThunk(llvm::Function *Fn, GlobalDecl GD, FPT->isVariadic()); llvm::Value *Callee = CGM.GetAddrOfFunction(GD, Ty, /*ForVTable=*/true); - FunctionType::ExtInfo Info = FPT->getExtInfo(); - - if (IsWin64) { - Info = Info.withCallingConv(CC_Win64ThisCall); - } - const CGFunctionInfo &FnInfo = - CGM.getTypes().getFunctionInfo(ResultType, CallArgs, Info); + CGM.getTypes().getFunctionInfo(ResultType, CallArgs, + FPT->getExtInfo()); // Determine whether we have a return value slot to use. ReturnValueSlot Slot; |