diff --git a/CodeGen/CodeGenFunction.cpp b/CodeGen/CodeGenFunction.cpp
index f48d093..7d70e6c 100644
--- a/CodeGen/CodeGenFunction.cpp
+++ b/CodeGen/CodeGenFunction.cpp
@@ -15,6 +15,7 @@
 #include "CodeGenModule.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/AST/AST.h"
+#include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
@@ -76,6 +77,9 @@
   else if (FD->getStorageClass() == FunctionDecl::Static)
     CurFn->setLinkage(llvm::Function::InternalLinkage);
 
+  if (FD->getAttr<FastCallAttr>())
+    CurFn->setCallingConv(llvm::CallingConv::Fast);
+
   if (const VisibilityAttr *attr = FD->getAttr<VisibilityAttr>())
     CurFn->setVisibility(attr->getVisibility());
   // FIXME: else handle -fvisibility