2 files changed, 22 insertions, 6 deletions
diff --git a/clang/CodeGen/CodeGenFunction.cpp b/clang/CodeGen/CodeGenFunction.cpp
index 817c5fca74e..bb7a05717ad 100644
--- a/clang/CodeGen/CodeGenFunction.cpp
+++ b/clang/CodeGen/CodeGenFunction.cpp
@@ -121,11 +121,16 @@ const llvm::Type *CodeGenFunction::ConvertType(QualType T, SourceLocation Loc) {
       ResultType = ConvertType(FP.getResultType(), Loc);
     
     // FIXME: Convert argument types.
+    bool isVarArg;
+    std::vector<const llvm::Type*> ArgTys;
+    if (const FunctionTypeProto *FTP = dyn_cast<FunctionTypeProto>(&FP)) {
+      DecodeArgumentTypes(*FTP, ArgTys, Loc);
+      isVarArg = FTP->isVariadic();
+    } else {
+      isVarArg = true;
+    }
     
-    return llvm::FunctionType::get(ResultType,
-                                   std::vector<const llvm::Type*>(),
-                                   false,
-                                   0);
+    return llvm::FunctionType::get(ResultType, ArgTys, isVarArg, 0);
   }
   case Type::TypeName:
   case Type::Tagged:
@@ -136,6 +141,12 @@ const llvm::Type *CodeGenFunction::ConvertType(QualType T, SourceLocation Loc) {
   return OpaqueType::get();
 }
 
+void  CodeGenFunction::DecodeArgumentTypes(const FunctionTypeProto &FTP, 
+                                           std::vector<const llvm::Type*> &
+                                           ArgTys, SourceLocation Loc) {
+  for (unsigned i = 0, e = FTP.getNumArgs(); i != e; ++i)
+    ArgTys.push_back(ConvertType(FTP.getArgType(i), Loc));
+}
 
 void CodeGenFunction::GenerateCode(const FunctionDecl *FD) {
   LLVMIntTy = ConvertType(getContext().IntTy, FD->getLocation());
diff --git a/clang/CodeGen/CodeGenFunction.h b/clang/CodeGen/CodeGenFunction.h
index 025c4f49782..e5be910ad31 100644
--- a/clang/CodeGen/CodeGenFunction.h
+++ b/clang/CodeGen/CodeGenFunction.h
@@ -16,16 +16,18 @@
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/LLVMBuilder.h"
+#include <vector>
 
 namespace llvm {
   class Module;
 namespace clang {
+  class SourceLocation;
+  class TargetInfo;
   class ASTContext;
   class Decl;
   class FunctionDecl;
   class QualType;
-  class SourceLocation;
-  class TargetInfo;
+  class FunctionTypeProto;
   
   class Stmt;
   class CompoundStmt;
@@ -142,6 +144,9 @@ public:
   ASTContext &getContext() const;
 
   const llvm::Type *ConvertType(QualType T, SourceLocation Loc);
+  void DecodeArgumentTypes(const FunctionTypeProto &FTP, 
+                           std::vector<const llvm::Type*> &ArgTys,
+                           SourceLocation Loc);
   
   void GenerateCode(const FunctionDecl *FD);