commit 88d117c2eedd7c5bec57ac983a98d5e12bdd2cc6
author Tilmann Scheller <tilmann.scheller@googlemail.com> Wed Mar 02 19:36:23 2011 +0000
committer Tilmann Scheller <tilmann.scheller@googlemail.com> Wed Mar 02 19:36:23 2011 +0000
tree 8ffc9cc441cf35e4ac650b20dde423ebe58a8641
parent c314aa484524c6a310a51e7b83bc194774e95e90

Add CC_Win64ThisCall and set it in the necessary places.

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

lib/CodeGen/CGBlocks.cpp

diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index 9587de2..8cd1f5e 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -922,7 +922,7 @@
 
   // Begin generating the function.
   StartFunction(blockDecl, fnType->getResultType(), fn, args,
-                blockInfo.getBlockExpr()->getBody()->getLocEnd());
+                blockInfo.getBlockExpr()->getBody()->getLocEnd(), CC_Default);
   CurFuncDecl = outerFnDecl; // StartFunction sets this to blockDecl
 
   // Okay.  Undo some of what StartFunction did.
@@ -1078,7 +1078,7 @@
                                           SC_None,
                                           false,
                                           true);
-  StartFunction(FD, C.VoidTy, Fn, args, SourceLocation());
+  StartFunction(FD, C.VoidTy, Fn, args, SourceLocation(), CC_Default);
 
   const llvm::Type *structPtrTy = blockInfo.StructureType->getPointerTo();
 
@@ -1167,7 +1167,7 @@
                                           SC_Static,
                                           SC_None,
                                           false, true);
-  StartFunction(FD, C.VoidTy, Fn, args, SourceLocation());
+  StartFunction(FD, C.VoidTy, Fn, args, SourceLocation(), CC_Default);
 
   const llvm::Type *structPtrTy = blockInfo.StructureType->getPointerTo();
 
@@ -1270,7 +1270,7 @@
                                           SC_Static,
                                           SC_None,
                                           false, true);
-  StartFunction(FD, R, Fn, Args, SourceLocation());
+  StartFunction(FD, R, Fn, Args, SourceLocation(), CC_Default);
 
   // dst->x
   llvm::Value *V = GetAddrOfLocalVar(Dst);
@@ -1340,7 +1340,7 @@
                                           SC_Static,
                                           SC_None,
                                           false, true);
-  StartFunction(FD, R, Fn, Args, SourceLocation());
+  StartFunction(FD, R, Fn, Args, SourceLocation(), CC_Default);
 
   llvm::Value *V = GetAddrOfLocalVar(Src);
   V = Builder.CreateBitCast(V, llvm::PointerType::get(T, 0));