commit ad29309ac7a29db2cc363bd4ace20fbf862a42d3
author Sean Callanan <scallanan@apple.com> Tue Jan 18 23:32:05 2011 +0000
committer Sean Callanan <scallanan@apple.com> Tue Jan 18 23:32:05 2011 +0000
tree 29331103497df577ae372c0a0eb67fb0fd877b1e
parent 7812e013be05cf8593d7a1d3a51bbb138c52ae90

Updated to revision 123723 of LLVM, to bring in
support for minimal type import functionality.


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

source/Symbol/ClangASTContext.cpp

diff --git a/source/Symbol/ClangASTContext.cpp b/source/Symbol/ClangASTContext.cpp
index 41cddb0..0ec29b9 100644
--- a/source/Symbol/ClangASTContext.cpp
+++ b/source/Symbol/ClangASTContext.cpp
@@ -912,7 +912,8 @@
     FileSystemOptions file_system_options;
     FileManager file_manager (file_system_options);
     ASTImporter importer(*dst_ast, file_manager,
-                         *src_ast, file_manager);
+                         *src_ast, file_manager,
+                         false);
     
     QualType src (QualType::getFromOpaquePtr(clang_type));
     QualType dst (importer.Import(src));
@@ -929,7 +930,8 @@
     FileSystemOptions file_system_options;
     FileManager file_manager (file_system_options);
     ASTImporter importer(*dst_ast, file_manager,
-                         *src_ast, file_manager);
+                         *src_ast, file_manager,
+                         false);
     
     return importer.Import(source_decl);
 }
@@ -1629,7 +1631,8 @@
                                      is_virtual, 
                                      base_of_class, 
                                      ConvertAccessTypeToAccessSpecifier (access), 
-                                     getASTContext()->CreateTypeSourceInfo (QualType::getFromOpaquePtr(base_class_type)));
+                                     getASTContext()->CreateTypeSourceInfo (QualType::getFromOpaquePtr(base_class_type)),
+                                     SourceLocation());
     return NULL;
 }
 
@@ -2278,6 +2281,7 @@
         case clang::BuiltinType::Bool:
         case clang::BuiltinType::Char_U:
         case clang::BuiltinType::UChar:
+        case clang::BuiltinType::WChar_U:
         case clang::BuiltinType::Char16:
         case clang::BuiltinType::Char32:
         case clang::BuiltinType::UShort:
@@ -2287,7 +2291,7 @@
         case clang::BuiltinType::UInt128:
         case clang::BuiltinType::Char_S:
         case clang::BuiltinType::SChar:
-        case clang::BuiltinType::WChar:
+        case clang::BuiltinType::WChar_S:
         case clang::BuiltinType::Short:
         case clang::BuiltinType::Int:
         case clang::BuiltinType::Long:
@@ -3562,16 +3566,18 @@
         qual_type_args.push_back (QualType::getFromOpaquePtr(args[i]));
 
     // TODO: Detect calling convention in DWARF?
+    FunctionProtoType::ExtProtoInfo proto_info;
+    proto_info.Variadic = is_variadic;
+    proto_info.HasExceptionSpec = false;
+    proto_info.HasAnyExceptionSpec = false;
+    proto_info.TypeQuals = type_quals;
+    proto_info.NumExceptions = 0;
+    proto_info.Exceptions = NULL;
+    
     return ast->getFunctionType(QualType::getFromOpaquePtr(result_type),
                                         qual_type_args.empty() ? NULL : &qual_type_args.front(),
                                         qual_type_args.size(),
-                                        is_variadic,
-                                        type_quals,
-                                        false,  // hasExceptionSpec
-                                        false,  // hasAnyExceptionSpec,
-                                        0,      // NumExs
-                                        0,      // const QualType *ExArray
-                                        FunctionType::ExtInfo ()).getAsOpaquePtr();    // NoReturn);
+                                        proto_info).getAsOpaquePtr();    // NoReturn);
 }
 
 ParmVarDecl *