From c81256a5952ec95ed8521404d599c63ccda812eb Mon Sep 17 00:00:00 2001
From: Sean Callanan <scallanan@apple.com>
Date: Thu, 16 Sep 2010 20:40:25 +0000
Subject: [PATCH] Made CreateFunctionType static.  Also fixed the spelling for
 CreateParameterDeclaration.

llvm-svn: 114111
---
 lldb/include/lldb/Symbol/ClangASTContext.h    | 28 +++++++++++++++----
 .../SymbolFile/DWARF/SymbolFileDWARF.cpp      |  2 +-
 lldb/source/Symbol/ClangASTContext.cpp        | 16 +++++++----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/lldb/include/lldb/Symbol/ClangASTContext.h b/lldb/include/lldb/Symbol/ClangASTContext.h
index 24eba67da2dd..ae1b4d658efa 100644
--- a/lldb/include/lldb/Symbol/ClangASTContext.h
+++ b/lldb/include/lldb/Symbol/ClangASTContext.h
@@ -346,16 +346,32 @@ public:
                                int storage,
                                bool is_inline);
     
-    void *
-    CreateFunctionType (void * result_type,
+    static void *
+    CreateFunctionType (clang::ASTContext *ast_context,
+                        void *result_type,
                         void **args,
                         unsigned num_args,
-                        bool isVariadic,
-                        unsigned TypeQuals);
+                        bool is_variadic,
+                        unsigned type_quals);
+    
+    void *
+    CreateFunctionType (void *result_type,
+                        void **args,
+                        unsigned num_args,
+                        bool is_variadic,
+                        unsigned type_quals)
+    {
+        return ClangASTContext::CreateFunctionType(m_ast_context_ap.get(),
+                                                   result_type,
+                                                   args,
+                                                   num_args,
+                                                   is_variadic,
+                                                   type_quals);
+    }
     
     clang::ParmVarDecl *
-    CreateParmeterDeclaration (const char *name,
-                               void * return_type,
+    CreateParameterDeclaration (const char *name,
+                               void *param_type,
                                int storage);
 
     void
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index 1689517a697a..7aa203dc92dd 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -1987,7 +1987,7 @@ SymbolFileDWARF::ParseChildParameters
                     {
                         function_param_types.push_back (dc_type->GetOpaqueClangQualType());
 
-                        clang::ParmVarDecl *param_var_decl = type_list->GetClangASTContext().CreateParmeterDeclaration (name, dc_type->GetOpaqueClangQualType(), storage);
+                        clang::ParmVarDecl *param_var_decl = type_list->GetClangASTContext().CreateParameterDeclaration (name, dc_type->GetOpaqueClangQualType(), storage);
                         assert(param_var_decl);
                         function_param_decls.push_back(param_var_decl);
                     }
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 02a372e56f3e..461931fdc311 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -2497,9 +2497,13 @@ ClangASTContext::CreateFunctionDeclaration (const char *name, void *function_cla
 }
 
 void *
-ClangASTContext::CreateFunctionType (void *result_type, void **args, unsigned num_args, bool isVariadic, unsigned TypeQuals)
+ClangASTContext::CreateFunctionType (clang::ASTContext *ast_context,
+                                     void *result_type, 
+                                     void **args, 
+                                     unsigned num_args, 
+                                     bool is_variadic, 
+                                     unsigned type_quals)
 {
-    ASTContext *ast_context = getASTContext();
     assert (ast_context != NULL);
     std::vector<QualType> qual_type_args;
     for (unsigned i=0; i<num_args; ++i)
@@ -2509,8 +2513,8 @@ ClangASTContext::CreateFunctionType (void *result_type, void **args, unsigned nu
     return ast_context->getFunctionType(QualType::getFromOpaquePtr(result_type),
                                         qual_type_args.empty() ? NULL : &qual_type_args.front(),
                                         qual_type_args.size(),
-                                        isVariadic,
-                                        TypeQuals,
+                                        is_variadic,
+                                        type_quals,
                                         false,  // hasExceptionSpec
                                         false,  // hasAnyExceptionSpec,
                                         0,      // NumExs
@@ -2519,7 +2523,7 @@ ClangASTContext::CreateFunctionType (void *result_type, void **args, unsigned nu
 }
 
 ParmVarDecl *
-ClangASTContext::CreateParmeterDeclaration (const char *name, void *return_type, int storage)
+ClangASTContext::CreateParameterDeclaration (const char *name, void *param_type, int storage)
 {
     ASTContext *ast_context = getASTContext();
     assert (ast_context != NULL);
@@ -2527,7 +2531,7 @@ ClangASTContext::CreateParmeterDeclaration (const char *name, void *return_type,
                                 ast_context->getTranslationUnitDecl(),
                                 SourceLocation(),
                                 name && name[0] ? &ast_context->Idents.get(name) : NULL,
-                                QualType::getFromOpaquePtr(return_type),
+                                QualType::getFromOpaquePtr(param_type),
                                 NULL,
                                 (VarDecl::StorageClass)storage,
                                 (VarDecl::StorageClass)storage,