From 99cc30c371b7c3706bec267fd35019d035913489 Mon Sep 17 00:00:00 2001 From: Tilmann Scheller Date: Wed, 2 Mar 2011 21:36:49 +0000 Subject: Revert "Add CC_Win64ThisCall and set it in the necessary places." This reverts commit 126863. llvm-svn: 126886 --- clang/lib/CodeGen/CGVTables.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'clang/lib/CodeGen/CGVTables.cpp') diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index 6acbe436c85..891697f4cd0 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/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; -- cgit v1.2.3